Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_148205379858690"
MIME-Version: 1.0
Date: Sun, 18 Dec 2016 09:36:38 +0000
From: "Joerg Sonnenberger" <joerg@netbsd.org>
Subject: CVS commit: pkgsrc/pkgtools/pbulk
To: pkgsrc-changes@NetBSD.org
Reply-To: joerg@netbsd.org
Message-Id: <20161218093638.BC71FFBA6@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_148205379858690
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	joerg
Date:		Sun Dec 18 09:36:38 UTC 2016

Modified Files:
	pkgsrc/pkgtools/pbulk: Makefile
	pkgsrc/pkgtools/pbulk/files/pbulk/scripts: pkg-build

Log Message:
pbulk-0.62: cleanup if either the initial pkg_add round or the package
upload failed.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/pkgtools/pbulk/Makefile
cvs rdiff -u -r1.30 -r1.31 \
    pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_148205379858690
Content-Disposition: inline
Content-Length: 1988
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/pkgtools/pbulk/Makefile
diff -u pkgsrc/pkgtools/pbulk/Makefile:1.77 pkgsrc/pkgtools/pbulk/Makefile:1.78
--- pkgsrc/pkgtools/pbulk/Makefile:1.77	Mon May  9 00:08:21 2016
+++ pkgsrc/pkgtools/pbulk/Makefile	Sun Dec 18 09:36:38 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2016/05/09 00:08:21 joerg Exp $
+# $NetBSD: Makefile,v 1.78 2016/12/18 09:36:38 joerg Exp $
 
-PKGNAME=	pbulk-0.61
+PKGNAME=	pbulk-0.62
 COMMENT=	Modular bulk build framework
 
 .include "../../pkgtools/pbulk/Makefile.common"

Index: pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build
diff -u pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build:1.30 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build:1.31
--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build:1.30	Mon May  9 00:08:21 2016
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build	Sun Dec 18 09:36:38 2016
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pkg-build,v 1.30 2016/05/09 00:08:21 joerg Exp $
+# $NetBSD: pkg-build,v 1.31 2016/12/18 09:36:38 joerg Exp $
 #
 # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -179,7 +179,7 @@ cd ${pkgsrc}/${pkgdir}
 ${make} clean > ${bulklog}/${pkgname}/pre-clean.log 2>&1
 # Install all dependencies the package said it would need
 if [ ! -z "$dependencies" ]; then
-	${pkg_add_cmd} $dependencies > ${bulklog}/${pkgname}/depends.log 2>&1
+	${pkg_add_cmd} $dependencies > ${bulklog}/${pkgname}/depends.log 2>&1 || cleanup
 fi
 # Build package, create a separate log file for each major phase
 run_make ${run_checksum} checksum  > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup
@@ -214,7 +214,7 @@ fi
 # This is quite expensive and mostly redundant, so it is disabled by default.
 #${pkg_delete} -r \* > /dev/null 2>&1 || cleanup
 
-${sync_package} ${pkgfile} ${pkgname} "${categories}"
+${sync_package} ${pkgfile} ${pkgname} "${categories}" || cleanup
 
 # Clean build area
 ${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1 || true


--_----------=_148205379858690--