diff options
| author |   espie <espie@openbsd.org> | 2009-10-12 11:35:20 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2009-10-12 11:35:20 +0000 |
| commit | 8b05c2b5659b0f22372be0668d7c4da97f8b63e8 (patch) | |
| tree | dbbd08465d139b356bfa8f1732d7cd35d9a2c23a | |
| parent | Permit attributes to be turned off in #[] by prefixing with "no", for example (diff) | |
| download | wireguard-openbsd-8b05c2b5659b0f22372be0668d7c4da97f8b63e8.tar.xz wireguard-openbsd-8b05c2b5659b0f22372be0668d7c4da97f8b63e8.zip | |
more simple uses of set->newer
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index f71b9990a2e..b1c20d54438 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.69 2009/10/12 10:57:27 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.70 2009/10/12 11:35:20 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -126,14 +126,16 @@ sub find_elsewhere { my ($self, $solver, $state, $obj) = @_; - for my $dep (@{$solver->{plist}->{depend}}) { - my $r = $solver->find_old_lib($state, - $solver->{localbase}, $dep->{pattern}, $obj); - if ($r) { - print "found libspec $obj in old package $r\n" if $state->{verbose}; - return $r; + for my $n ($solver->{set}->newer) { + for my $dep (@{$n->{plist}->{depend}}) { + my $r = $solver->find_old_lib($state, + $solver->{localbase}, $dep->{pattern}, $obj); + if ($r) { + print "found libspec $obj in old package $r\n" if $state->{verbose}; + return $r; + } } - } + } return undef; } @@ -326,9 +328,11 @@ sub solve_depends $self->add_todo(@extra); - for my $dep (@{$self->{plist}->{depend}}) { - my $v = $self->solve_dependency($state, $dep); - $self->{to_register}->{$v} = $dep; + for my $package ($self->{set}->newer) { + for my $dep (@{$package->{plist}->{depend}}) { + my $v = $self->solve_dependency($state, $dep); + $self->{to_register}->{$v} = $dep; + } } return @{$self->{deplist}}; |