From owner-svn-src-projects@FreeBSD.ORG  Sun Jan 27 06:56:53 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3DD7628E;
 Sun, 27 Jan 2013 06:56:53 +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 0F5D726C;
 Sun, 27 Jan 2013 06:56:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0R6uqqx028713;
 Sun, 27 Jan 2013 06:56:52 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0R6uqvl028712;
 Sun, 27 Jan 2013 06:56:52 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301270656.r0R6uqvl028712@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 27 Jan 2013 06:56:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245965 - 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: Sun, 27 Jan 2013 06:56:53 -0000

Author: linimon (doc,ports committer)
Date: Sun Jan 27 06:56:52 2013
New Revision: 245965
URL: http://svnweb.freebsd.org/changeset/base/245965

Log:
  Deorbit buildproxy.

Modified:
  projects/portbuild/scripts/build

Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build	Sun Jan 27 06:47:20 2013	(r245964)
+++ projects/portbuild/scripts/build	Sun Jan 27 06:56:52 2013	(r245965)
@@ -11,8 +11,6 @@ pbd=${PORTBUILD_DATA:-/var/portbuild}
 # duplication.
 quoted_subdirs="'/src' '/ports' ''"
 
-DISABLE_PROXY=1
-
 # XXX unused
 get_latest_snap() {
     snap=$1
@@ -510,22 +508,8 @@ proxy_root() {
     shift 5
     args=$@
 
-if [ ! -z "${DISABLE_PROXY}" ]; then
-	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}"
-	error=$?
-	if [ ${error} -eq 254 ]; then
-	    echo "Proxy error"
-	fi
-    else
 	eval "do_${cmd} ${arch} ${branch} ${buildid} ${builddir} ${args}"
 	error=$?
-    fi
-fi
 
     exit ${error}
 }
@@ -540,19 +524,8 @@ proxy_user() {
     shift 5
     args=$@
 
-if [ ! -z "${DISABLE_PROXY}" ]; then
-	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}"
 	error=$?
-    else
-	su ${uid} -c "${pbc}/scripts/build ${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
-	error=$?
-    fi
-fi
 
     exit ${error}
 }