diff options
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 9 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 305db7462e9..f03132c2073 100644 --- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm +++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Dependencies.pm,v 1.89 2009/11/29 13:19:29 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.90 2009/12/02 11:36:27 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -250,9 +250,7 @@ sub find_dep_in_self { my ($self, $state, $dep) = @_; - return find_candidate($dep->spec, - map {$_->pkgname} $self->{set}->newer); - + return find_candidate($dep->spec, $self->{set}->newer_names); } sub find_dep_in_stuff_to_install @@ -350,7 +348,8 @@ sub check_depends my @bad = (); for my $dep ($self->dependencies) { - push(@bad, $dep) unless is_installed($dep); + push(@bad, $dep) + unless is_installed($dep) or $self->{set}->{newer}->{$dep}; } return @bad; } diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index 13737b9e321..eeec7822851 100644 --- a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm +++ b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: UpdateSet.pm,v 1.31 2009/11/30 16:15:13 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.32 2009/12/02 11:36:27 espie Exp $ # # Copyright (c) 2007 Marc Espie <espie@openbsd.org> # @@ -266,6 +266,7 @@ sub merge } # then regen tracker info for $self $tracker->add_set($self); + delete $self->{solver}; return $self; } |