diff options
| author | tron <tron> | 2009-05-30 20:55:24 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-05-30 20:55:24 +0000 |
| commit | fa9b19bd28e6e60f4bedc3b3c1914988e95941df (patch) | |
| tree | ac9104de840cbe18d84069c6408535d686ad7e4e | |
| parent | 3812e16442890823af61005ed3bf1393f1a467a0 (diff) | |
| download | pkgsrc-fa9b19bd28e6e60f4bedc3b3c1914988e95941df.tar.gz | |
Pullup ticket #2783 - requested by joerg
mk/flavor/pkg: fix update of packages that need to be preserved
Revisions pulled up:
- mk/flavor/pkg/deinstall.mk 1.9
---
Module Name: pkgsrc
Committed By: joerg
Date: Sat May 16 01:34:22 UTC 2009
Modified Files:
pkgsrc/mk/flavor/pkg: deinstall.mk
Log Message:
Remove preserve packages for make update with -N -f -f and therefore do
not depend on the behavior of older pkg_delete to allow the removal with
simple force.
| -rw-r--r-- | mk/flavor/pkg/deinstall.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/flavor/pkg/deinstall.mk b/mk/flavor/pkg/deinstall.mk index 8649b6e0732..2d991e34b35 100644 --- a/mk/flavor/pkg/deinstall.mk +++ b/mk/flavor/pkg/deinstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: deinstall.mk,v 1.8 2008/03/20 20:02:29 agc Exp $ +# $NetBSD: deinstall.mk,v 1.8.14.1 2009/05/30 20:55:24 tron Exp $ # Set the appropriate flags to pass to pkg_delete(1) based on the value # of DEINSTALLDEPENDS (see pkgsrc/mk/install/deinstall.mk). @@ -19,7 +19,7 @@ _PKG_ARGS_DEINSTALL+= -v .if defined(PKG_PRESERVE) . if defined(_UPDATE_RUNNING) && !empty(_UPDATE_RUNNING:M[yY][eE][sS]) -_PKG_ARGS_DEINSTALL+= -N -f # update w/o removing any files +_PKG_ARGS_DEINSTALL+= -N -f -f # update w/o removing any files . endif .endif |