Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 May 2011 14:07:32 +0000 (UTC)
From:      Florent Thoumie <flz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r222096 - projects/portbuild/scripts
Message-ID:  <201105191407.p4JE7Wu1040509@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105191407.p4JE7Wu1040509>