From owner-svn-src-projects@FreeBSD.ORG  Sat Dec 22 19:09:16 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 59CEB174;
 Sat, 22 Dec 2012 19:09:16 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 250548FC0C;
 Sat, 22 Dec 2012 19:09:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMJ9Gpb035021;
 Sat, 22 Dec 2012 19:09:16 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMJ9Gmd035020;
 Sat, 22 Dec 2012 19:09:16 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212221909.qBMJ9Gmd035020@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 22 Dec 2012 19:09:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244595 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 19:09:16 -0000

Author: linimon (doc,ports committer)
Date: Sat Dec 22 19:09:15 2012
New Revision: 244595
URL: http://svnweb.freebsd.org/changeset/base/244595

Log:
  Add code to test disabling the proxy entirely.  Requires zfs delegation
  to be set up correctly for it to work.

Modified:
  projects/portbuild/scripts/build

Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build	Sat Dec 22 15:13:16 2012	(r244594)
+++ projects/portbuild/scripts/build	Sat Dec 22 19:09:15 2012	(r244595)
@@ -11,6 +11,8 @@ pbd=${PORTBUILD_DATA:-/var/portbuild}
 # duplication.
 quoted_subdirs="'/src' '/ports' ''"
 
+#DISABLE_PROXY = True
+
 # XXX unused
 get_latest_snap() {
     snap=$1
@@ -522,6 +524,10 @@ proxy_root() {
     shift 5
     args=$@
 
+if DISABLE_PROXY:
+	eval "do_${cmd} ${arch} ${branch} ${buildid} ${builddir} ${args}"
+	error=$?
+else:
     id=$(id -u)
     if [ ${id} != "0" ]; then
 	${pbc}/scripts/buildproxy-client "build ${cmd} ${arch} ${branch} ${buildid} ${args}"
@@ -533,6 +539,7 @@ proxy_root() {
 	eval "do_${cmd} ${arch} ${branch} ${buildid} ${builddir} ${args}"
 	error=$?
     fi
+fi
 
     exit ${error}
 }
@@ -547,6 +554,10 @@ proxy_user() {
     shift 5
     args=$@
 
+if DISABLE_PROXY:
+	eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
+	error=$?
+else:
     id=$(id -u)
     if [ ${id} != "0" ]; then
 	eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
@@ -555,6 +566,7 @@ proxy_user() {
 	su ${uid} -c "${pbc}/scripts/build ${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
 	error=$?
     fi
+fi
 
     exit ${error}
 }