diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-12-21 01:43:59 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-12-21 01:43:59 +0000 |
| commit | 89aa12cd2683c46b0b992cca78791b6ad1315d19 (patch) | |
| tree | 43bb118db7a2d0b5c066eb3a0b34186dda6a20a0 /usr.sbin/pkg_add/OpenBSD | |
| parent | c3eaabde2d2d2ec6f7d9e85e6123963a2e0d5162 (diff) | |
correct checks to allow for a package to replace several packages.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index cc2a1b889c1..6ee7bdf300e 100644 --- a/usr.sbin/pkg_add/OpenBSD/Update.pm +++ b/usr.sbin/pkg_add/OpenBSD/Update.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Update.pm,v 1.46 2004/12/20 22:43:25 espie Exp $ +# $OpenBSD: Update.pm,v 1.47 2004/12/21 01:43:58 espie Exp $ # # Copyright (c) 2004 Marc Espie <espie@openbsd.org> # @@ -234,7 +234,7 @@ use OpenBSD::Error; sub can_do { - my ($toreplace, $replacement, $state) = @_; + my ($toreplace, $replacement, $state, $ignore) = @_; $state->{okay} = 1; $state->{libs_to_check} = []; @@ -251,6 +251,7 @@ sub can_do } my @wantlist = OpenBSD::RequiredBy->new($toreplace)->list(); for my $wanting (@wantlist) { + next if defined $ignore->{$wanting}; print "Verifying dependencies still match for $wanting\n" if $state->{verbose}; my $p2 = OpenBSD::PackingList->from_installation($wanting, \&OpenBSD::PackingList::DependOnly); |