svn commit: r221241 - projects/portbuild/scripts

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Sat Apr 30 02:44:15 2011
New Revision: 221241
URL: http://svn.freebsd.org/changeset/base/221241

Log:
  Bomb out if there are no bindist files.
  
  While here, remove an antique line.

Modified:
  projects/portbuild/scripts/dopackages

Modified: projects/portbuild/scripts/dopackages
==============================================================================
--- projects/portbuild/scripts/dopackages	Sat Apr 30 02:31:56 2011	(r221240)
+++ projects/portbuild/scripts/dopackages	Sat Apr 30 02:44:15 2011	(r221241)
@@ -403,6 +403,14 @@ if [ "$trybroken" = 1 ]; then
     export TRYBROKEN=1
 fi
 
+builddir=${pbab}/builds/${buildid}
+
+# bomb out if there are no bindist files
+if [ ! -f ${builddir}/bindist.tbz -o ! -f ${builddir}/bindist.tbz.md5 ]; then
+    echo "missing bindist.tbz and/or bindist.tbz.md5; exiting script at $(date)."
+    mailexit 1
+fi
+
 # Start setting up build environment
 
 if [ "${skipstart}" -eq 0 ]; then
@@ -413,10 +421,9 @@ if [ "${skipstart}" -eq 0 ]; then
     # MCL dopackages: "build create arch branch"
     build clone ${arch} ${branch} ${buildid} ${newbuildid}
     buildid=${newbuildid}
+    builddir=${pbab}/builds/${buildid}
 fi
 
-builddir=${pbab}/builds/${buildid}
-
 # bomb out if build clone failed
 if [ ! -d ${builddir} ]; then
     mailexit 1
@@ -692,8 +699,6 @@ fi
 
 cd ${builddir}/packages/All
 if [ "$nofinish" = 0 ]; then
-    rm -f Makefile
-    
     if [ "$norestr" = 0 ]; then
         # Before deleting restricted packages, save a copy so we don't
         # have to rebuild them next time