From owner-svn-src-projects@FreeBSD.ORG  Thu May 19 14:07:32 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 751C8106566B;
	Thu, 19 May 2011 14:07:32 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 65AC08FC0A;
	Thu, 19 May 2011 14:07:32 +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 p4JE7WW5040511;
	Thu, 19 May 2011 14:07:32 GMT (envelope-from flz@svn.freebsd.org)
Received: (from flz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4JE7Wu1040509;
	Thu, 19 May 2011 14:07:32 GMT (envelope-from flz@svn.freebsd.org)
Message-Id: <201105191407.p4JE7Wu1040509@svn.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Thu, 19 May 2011 14:07:32 +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: r222096 - 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: Thu, 19 May 2011 14:07:32 -0000

Author: flz
Date: Thu May 19 14:07:32 2011
New Revision: 222096
URL: http://svn.freebsd.org/changeset/base/222096

Log:
  portbuild: add missing check.
  
  Make sure portbuild.conf exists for the build before sourcing it.

Modified:
  projects/portbuild/scripts/dosetupnode

Modified: projects/portbuild/scripts/dosetupnode
==============================================================================
--- projects/portbuild/scripts/dosetupnode	Thu May 19 13:42:19 2011	(r222095)
+++ projects/portbuild/scripts/dosetupnode	Thu May 19 14:07:32 2011	(r222096)
@@ -61,7 +61,9 @@ setup() {
     echo "setting up of $node started at $(date)"
 
     . ${pbd}/${arch}/portbuild.conf
-    . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf
+    if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then
+        . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf
+    fi
     . ${pbd}/${arch}/portbuild.${node}
 
     if [ "${buildid}" != "-" ]; then