From owner-svn-src-projects@FreeBSD.ORG  Mon Jul 18 01:02:44 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 9A5381065670;
	Mon, 18 Jul 2011 01:02:44 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 89ACB8FC19;
	Mon, 18 Jul 2011 01:02:44 +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 p6I12iI1098502;
	Mon, 18 Jul 2011 01:02:44 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6I12ivP098500;
	Mon, 18 Jul 2011 01:02:44 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201107180102.p6I12ivP098500@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 18 Jul 2011 01:02:44 +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: r224164 - 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: Mon, 18 Jul 2011 01:02:44 -0000

Author: linimon (doc,ports committer)
Date: Mon Jul 18 01:02:44 2011
New Revision: 224164
URL: http://svn.freebsd.org/changeset/base/224164

Log:
  Add some more error checking.

Modified:
  projects/portbuild/scripts/portbuild

Modified: projects/portbuild/scripts/portbuild
==============================================================================
--- projects/portbuild/scripts/portbuild	Mon Jul 18 01:01:44 2011	(r224163)
+++ projects/portbuild/scripts/portbuild	Mon Jul 18 01:02:44 2011	(r224164)
@@ -173,6 +173,9 @@ echo "building ${pkgname} in ${chroot}"
 
 bindist=${buildroot}/${branch}/${buildid}/tarballs/bindist.tar
 bindistlocal=${buildroot}/${branch}/${buildid}/tarballs/bindist-$(hostname).tar
+if [ ! -f $bindist ]; then
+  bailout ${chroot} ${clean} 255 ${pkgname}
+fi
 
 if [ -f ${chroot}/.notready ]; then
   tar -C ${chroot} -xpf ${bindist}
@@ -201,8 +204,8 @@ fi
 trap "bailout ${chroot} ${clean} ${error} ${pkgname}" 1 2 3 9 10 11 15
 
 rm -rf ${chroot}/tmp/*
-cd ${chroot}/tmp
-mkdir -p depends distfiles packages
+cd ${chroot}/tmp || bailout ${chroot} ${clean} 255 ${pkgname}
+mkdir -p depends distfiles packages || bailout ${chroot} ${clean} 255 ${pkgname}
 
 echo "building ${pkgname} on $(hostname)" | tee ${chroot}/tmp/${pkgname}.log
 echo "in directory ${chroot}" | tee -a ${chroot}/tmp/${pkgname}.log