diff options
| author | joerg <joerg@pkgsrc.org> | 2010-07-23 21:19:40 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-07-23 21:19:40 +0000 |
| commit | d1f2d83167ce20f8210bd4443d82ba6d4b57b4c2 (patch) | |
| tree | 3bbd15b6bf6348c835b88042e3799c9922793167 /pkgtools | |
| parent | f80bae9c8decd4958df8f6a79746842da73e522b (diff) | |
| download | pkgsrc-d1f2d83167ce20f8210bd4443d82ba6d4b57b4c2.tar.gz | |
pbulk-0.48: If pkg_add fails, remove binary package
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 0aa86f37438..3f886cf6b3c 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.61 2010/06/15 21:11:43 joerg Exp $ +# $NetBSD: Makefile,v 1.62 2010/07/23 21:19:40 joerg Exp $ -DISTNAME= pbulk-0.47 +DISTNAME= pbulk-0.48 COMMENT= Modular bulk build framework PKG_DESTDIR_SUPPORT= user-destdir diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 5058a7219ea..af1da2657ba 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.21 2010/06/15 21:11:43 joerg Exp $ +# $NetBSD: pkg-build,v 1.22 2010/07/23 21:19:40 joerg Exp $ # # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -192,8 +192,11 @@ run_make run_direct package > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup # be installed. if [ "${use_destdir}" != "no" ] && \ [ -z "${is_bootstrap}" ]; then - ${pkg_add_cmd} ${pkgname} \ - > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup + if ! ${pkg_add_cmd} ${pkgname} \ + > ${bulklog}/${pkgname}/package.log 2>&1; then + run_make run_direct package-clean + cleanup + fi fi # Clean build area |