diff options
| author | joerg <joerg@pkgsrc.org> | 2016-12-18 09:36:38 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-12-18 09:36:38 +0000 |
| commit | 583999b8260cd0c361667fdc08163dce222acc90 (patch) | |
| tree | e1dc394828e1b9e3aa239890f596f955377368c9 /pkgtools | |
| parent | 67fba4bda1ae59f625541114e3061320635f8186 (diff) | |
| download | pkgsrc-583999b8260cd0c361667fdc08163dce222acc90.tar.gz | |
pbulk-0.62: cleanup if either the initial pkg_add round or the package
upload failed.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 3dee7bd68bc..2db34b1e8e3 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -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" diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 886e462ae0f..f11d4c2e5da 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build @@ -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 |