svn commit: r228807 - projects/portbuild/scripts

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Thu Dec 22 16:36:08 2011
New Revision: 228807
URL: http://svn.freebsd.org/changeset/base/228807

Log:
  We never wound up using specialize portbuild.conf files at the branch/builds/
  directory, but instead at branch/builds/buildid.  Reflect that.

Modified:
  projects/portbuild/scripts/dopackages

Modified: projects/portbuild/scripts/dopackages
==============================================================================
--- projects/portbuild/scripts/dopackages	Thu Dec 22 16:19:51 2011	(r228806)
+++ projects/portbuild/scripts/dopackages	Thu Dec 22 16:36:08 2011	(r228807)
@@ -459,11 +459,8 @@ touch ${builddir}/.active
 ln -sf ${pbd}/${arch}/archive/buildlogs/log.${branch}.${datestamp} \
     ${builddir}/build.log
 
-# Update build-specific portbuild.conf.
-if [ -f ${pbd}/${arch}/${branch}/portbuild.conf ]; then
-    ln -sf ${pbd}/${arch}/${branch}/portbuild.conf ${builddir}/portbuild.conf
-    . ${builddir}/portbuild.conf
-fi
+# Use build-specific portbuild.conf
+test -f ${builddir}/portbuild.conf && . ${builddir}/portbuild.conf
 
 if [ "$skipstart" = 0 ]; then