From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 21 21:39:30 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79750106564A;
	Wed, 21 Dec 2011 21:39:30 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6459C8FC12;
	Wed, 21 Dec 2011 21:39:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBLLdUB8086858;
	Wed, 21 Dec 2011 21:39:30 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBLLdUA6086856;
	Wed, 21 Dec 2011 21:39:30 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201112212139.pBLLdUA6086856@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 21 Dec 2011 21:39:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228792 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 21 Dec 2011 21:39:30 -0000

Author: linimon (doc,ports committer)
Date: Wed Dec 21 21:39:30 2011
New Revision: 228792
URL: http://svn.freebsd.org/changeset/base/228792

Log:
  Remove redundant sourcings of portbuild.conf that were stepping on
  values from the build-specific portbuild.conf, then clean up the
  resulting mess.

Modified:
  projects/portbuild/scripts/pdispatch

Modified: projects/portbuild/scripts/pdispatch
==============================================================================
--- projects/portbuild/scripts/pdispatch	Wed Dec 21 20:47:24 2011	(r228791)
+++ projects/portbuild/scripts/pdispatch	Wed Dec 21 21:39:30 2011	(r228792)
@@ -21,9 +21,9 @@ pbab=${pbd}/${arch}/${branch}
 . ${pbc}/conf/server.conf
 . ${pbc}/conf/common.conf
 . ${pbd}/${arch}/portbuild.conf
-if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then
+test -f ${pbd}/${arch}/portbuild.${host} && . ${pbd}/${arch}/portbuild.${host}
+test -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf && \
     . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf
-fi
 . ${pbc}/scripts/buildenv
 
 timeout=${PDISPATCH_TIMEOUT}
@@ -81,8 +81,6 @@ if [ "x$TRYBROKEN" != "x" ]; then
 fi
 
 chroot=
-. ${pbd}/${arch}/portbuild.conf
-test -f ${pbd}/${arch}/portbuild.${host} && . ${pbd}/${arch}/portbuild.${host}
 
 # Upload scripts/claim-chroot as per-build scripts aren't in place yet.
 cmdpath=$(cat ${pbc}/scripts/claim-chroot | ${ssh_cmd} -a ${client_user}@${host} 't=$(mktemp -t claim-chroot); cat >$t; echo $t; chmod 755 $t')
@@ -139,9 +137,6 @@ if [ -z "${chroot}" ]; then
     exit 254
 fi
 
-. ${pbd}/${arch}/portbuild.conf
-test -f ${pbd}/${arch}/portbuild.${host} && . ${pbd}/${arch}/portbuild.${host}
-    
 rm -f ${builddir}/logs/${pkgname}.log ${builddir}/logs/${pkgname}.log.bz2
 rm -f ${builddir}/errors/${pkgname}.log ${builddir}/errors/${pkgname}.log.bz2