diff options
| author | joerg <joerg> | 2008-02-26 13:57:51 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-02-26 13:57:51 +0000 |
| commit | 6d11bfb4b6a5ce4634816df711318a7cb4fe6ad7 (patch) | |
| tree | 17204249952c0466b51250059e5f184ddadfd680 | |
| parent | f31b63b26295e56abae6f1b1fd53a5c37dfad6a4 (diff) | |
| download | pkgsrc-6d11bfb4b6a5ce4634816df711318a7cb4fe6ad7.tar.gz | |
pbulk-0.28:
- don't try to deinstall (and fail) on packages marked not for uninstall
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 3f9012aecbc..8616d82f198 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2008/02/07 13:41:26 tnn Exp $ +# $NetBSD: Makefile,v 1.36 2008/02/26 13:57:51 joerg Exp $ -DISTNAME= pbulk-0.27 +DISTNAME= pbulk-0.28 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 24f4a8dcd2d..0d42a9378cd 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.13 2008/01/29 08:14:44 tnn Exp $ +# $NetBSD: pkg-build,v 1.14 2008/02/26 13:57:51 joerg Exp $ # # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -162,8 +162,9 @@ fi ${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1 # Test uninstall rules. This is not for cross-compiling as the install script -# is not run in that case anyway. -if [ "$cross_compile" = "no" ]; then +# is not run in that case anyway. This is also not done for packages marked as +# uninstallable. The most important example for this is pkg_install itself. +if [ "$cross_compile" = "no" ] && [ ! -f "${cur_pkgdb}/${pkgname}/+PRESERVE" ]; then ${pkg_delete} -K ${cur_pkgdb} ${pkgname} > ${bulklog}/${pkgname}/deinstall.log 2>&1 fi |