Date: Thu, 22 Nov 2012 03:55:02 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243388 - projects/portbuild/scripts Message-ID: <201211220355.qAM3t28g087857@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Thu Nov 22 03:55:02 2012 New Revision: 243388 URL: http://svnweb.freebsd.org/changeset/base/243388 Log: More anti-foot-shooting measures. Modified: projects/portbuild/scripts/dopackages Modified: projects/portbuild/scripts/dopackages ============================================================================== --- projects/portbuild/scripts/dopackages Thu Nov 22 03:54:51 2012 (r243387) +++ projects/portbuild/scripts/dopackages Thu Nov 22 03:55:02 2012 (r243388) @@ -59,6 +59,13 @@ shift 4 . ${pbc}/scripts/buildenv validate_env ${arch} ${branch} || usage +if [ -f ${pbd}/${arch}/portbuild.conf ]; then + . ${pbd}/${arch}/portbuild.conf +else + echo "file ${pbd}/${arch}/portbuild.conf must exist!" + exit 1 +fi + # XXX MCL too early to do this here. buildid=$(resolve ${pbd} ${arch} ${branch} ${buildid}) if [ -z "${buildid}" ]; then @@ -66,13 +73,6 @@ if [ -z "${buildid}" ]; then exit 1 fi -if [ -f ${pbd}/${arch}/portbuild.conf ]; then - . ${pbc}/conf/server.conf - . ${pbd}/${arch}/portbuild.conf -else - usage -fi - pbab=${pbd}/${arch}/${branch} trap "exit 1" 1 2 3 9 10 11 15
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211220355.qAM3t28g087857>