diff options
| author | joerg <joerg> | 2009-06-17 12:54:57 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-06-17 12:54:57 +0000 |
| commit | 33222ef7ff444cc316a6c7c23e84f885934e6dbb (patch) | |
| tree | 078f762d0ff3c12a8dd0656f211fe1c83cc0580b /mk | |
| parent | cd4295c7c5b45a23ed4b644d836e3937fd38fa31 (diff) | |
| download | pkgsrc-33222ef7ff444cc316a6c7c23e84f885934e6dbb.tar.gz | |
Make sure that _UPDATE_RUNNING=YES is passed down to su-deinstall for
PKG_PRESERVE packages (e.g. pkg_install). Otherwise an old version of
pkg_install is not removed from pkgdb.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/deinstall.mk | 4 | ||||
| -rw-r--r-- | mk/install/deinstall.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mk/flavor/pkg/deinstall.mk b/mk/flavor/pkg/deinstall.mk index 3130f900d45..f7476a389ff 100644 --- a/mk/flavor/pkg/deinstall.mk +++ b/mk/flavor/pkg/deinstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: deinstall.mk,v 1.9 2009/05/16 01:34:22 joerg Exp $ +# $NetBSD: deinstall.mk,v 1.10 2009/06/17 12:54:57 joerg Exp $ # Set the appropriate flags to pass to pkg_delete(1) based on the value # of DEINSTALLDEPENDS (see pkgsrc/mk/install/deinstall.mk). @@ -20,6 +20,8 @@ _PKG_ARGS_DEINSTALL+= -v .if defined(PKG_PRESERVE) . if defined(_UPDATE_RUNNING) && !empty(_UPDATE_RUNNING:M[yY][eE][sS]) _PKG_ARGS_DEINSTALL+= -N -f -f # update w/o removing any files + +MAKEFLAGS.su-deinstall+= _UPDATE_RUNNING=YES . endif .endif diff --git a/mk/install/deinstall.mk b/mk/install/deinstall.mk index b98913efd53..029116c2329 100644 --- a/mk/install/deinstall.mk +++ b/mk/install/deinstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: deinstall.mk,v 1.9 2007/08/20 10:59:05 joerg Exp $ +# $NetBSD: deinstall.mk,v 1.10 2009/06/17 12:54:57 joerg Exp $ # DEINSTALLDEPENDS controls whether dependencies and dependents are also # removed when a package is de-installed. The valid values are: @@ -40,7 +40,7 @@ su-deinstall: ${_SU_DEINSTALL_TARGETS} acquire-deinstall-lock: acquire-localbase-lock release-deinstall-lock: release-localbase-lock -MAKEFLAGS.su-deinstall= DEINSTALLDEPENDS=${DEINSTALLDEPENDS} +MAKEFLAGS.su-deinstall+= DEINSTALLDEPENDS=${DEINSTALLDEPENDS} ###################################################################### ### reinstall (PUBLIC) |