Date: Wed, 21 Dec 2011 21:39:30 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r228792 - projects/portbuild/scripts Message-ID: <201112212139.pBLLdUA6086856@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112212139.pBLLdUA6086856>