From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 19:16:01 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 0DDDA2B0; Sat, 22 Dec 2012 19:16:01 +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 E52C98FC0C; Sat, 22 Dec 2012 19:16:00 +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 qBMJG0uH036202; Sat, 22 Dec 2012 19:16:00 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMJG0KR036200; Sat, 22 Dec 2012 19:16:00 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201212221916.qBMJG0KR036200@svn.freebsd.org> From: Mark Linimon <linimon@FreeBSD.org> Date: Sat, 22 Dec 2012 19:16:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244596 - 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 " projects" 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:16:01 -0000 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}"