Date: Sat, 22 Dec 2012 19:16:00 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244596 - projects/portbuild/scripts Message-ID: <201212221916.qBMJG0KR036200@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Sat Dec 22 19:16:00 2012 New Revision: 244596 URL: http://svnweb.freebsd.org/changeset/base/244596 Log: Hey, one languange or another, they're all the same, right? Modified: projects/portbuild/scripts/build Modified: projects/portbuild/scripts/build ============================================================================== --- projects/portbuild/scripts/build Sat Dec 22 19:09:15 2012 (r244595) +++ projects/portbuild/scripts/build Sat Dec 22 19:16:00 2012 (r244596) @@ -11,7 +11,7 @@ pbd=${PORTBUILD_DATA:-/var/portbuild} # duplication. quoted_subdirs="'/src' '/ports' ''" -#DISABLE_PROXY = True +#DISABLE_PROXY=1 # XXX unused get_latest_snap() { @@ -524,10 +524,10 @@ proxy_root() { shift 5 args=$@ -if DISABLE_PROXY: +if [ ! -z "${DISABLE_PROXY}" ]; then eval "do_${cmd} ${arch} ${branch} ${buildid} ${builddir} ${args}" error=$? -else: +else id=$(id -u) if [ ${id} != "0" ]; then ${pbc}/scripts/buildproxy-client "build ${cmd} ${arch} ${branch} ${buildid} ${args}" @@ -554,10 +554,10 @@ proxy_user() { shift 5 args=$@ -if DISABLE_PROXY: +if [ ! -z "${DISABLE_PROXY}" ]; then eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}" error=$? -else: +else id=$(id -u) if [ ${id} != "0" ]; then eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212221916.qBMJG0KR036200>