svn commit: r245965 - projects/portbuild/scripts

[Mark Linimon]

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}
 }