diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-11-29 11:22:26 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-11-29 11:22:26 +0000 |
| commit | 81234400edda9522378801123bac38d504903222 (patch) | |
| tree | fcc54bb918c555876570e5e3e0d2a8b178bedfcd /usr.sbin/pkg_add/OpenBSD/Replace.pm | |
| parent | 4de884c57a9032f52c167129a0ccf37c027f713f (diff) | |
clean up conflict handling and dependency adjustement: build list
of conflict globally, add it as old handles, and then use it everywhere.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Replace.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index e25b2f5b663..67a076cdc16 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.56 2009/11/29 06:51:12 espie Exp $ +# $OpenBSD: Replace.pm,v 1.57 2009/11/29 11:22:25 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # @@ -308,7 +308,7 @@ sub perform_extraction sub can_old_package_be_replaced { - my ($old_plist, $set, $state, $ignore) = @_; + my ($old_plist, $set, $state) = @_; $state->{okay} = 1; $state->{journal} = []; @@ -332,7 +332,7 @@ sub can_old_package_be_replaced my @wantlist = OpenBSD::RequiredBy->new($old_plist->pkgname)->list; my @r = (); for my $wanting (@wantlist) { - push(@r, $wanting) if !defined $ignore->{$wanting}; + push(@r, $wanting) if !defined $set->{older}->{$wanting}; } if (@r) { $state->say("Verifying dependencies still match for ", |