diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-14 09:12:44 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-14 09:12:44 +0000 |
| commit | 9ddaa8ba3a58ad38b2ac876104ce09ac9286241b (patch) | |
| tree | 84792480ef2f7a7ef06a067da0265dfffcdd873b /usr.sbin | |
| parent | 4f29ba361a543816a07422023936c6be051fb114 (diff) | |
temporary fix for kept packages until we move them away
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index 3ce489dde72..f11ef8947f0 100644 --- a/usr.sbin/pkg_add/OpenBSD/Replace.pm +++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Replace.pm,v 1.58 2009/12/13 17:57:57 espie Exp $ +# $OpenBSD: Replace.pm,v 1.59 2009/12/14 09:12:43 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # @@ -470,6 +470,10 @@ sub save_libs_from_handle for my $n ($set->newer) { $n->plist->unmark_lib($libs, $p); } + for my $n ($set->older) { + next unless $n->{keepit}; + $n->plist->unmark_lib($libs, $p); + } if (%$libs) { $state->say("Libraries to keep: ", @@ -485,6 +489,7 @@ sub save_old_libraries my ($set, $state) = @_; for my $o ($set->older) { + next if $o->{keepit}; save_libs_from_handle($o, $set, $state); } } |