From owner-svn-src-projects@FreeBSD.ORG  Thu Nov 22 03:55:02 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 80496D2C;
 Thu, 22 Nov 2012 03:55:02 +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 66FD58FC15;
 Thu, 22 Nov 2012 03:55:02 +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 qAM3t2rR087858;
 Thu, 22 Nov 2012 03:55:02 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAM3t28g087857;
 Thu, 22 Nov 2012 03:55:02 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201211220355.qAM3t28g087857@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 22 Nov 2012 03:55:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243388 - 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 &quot; projects&quot;
 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: Thu, 22 Nov 2012 03:55:02 -0000

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