diff options
| author |   espie <espie@openbsd.org> | 2018-07-01 08:24:20 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2018-07-01 08:24:20 +0000 |
| commit | 6b6a352c2d20c18545b1c3fe1b52751e341b4737 (patch) | |
| tree | 791db6ff47588f537c4d10b2be29ae330074aad2 | |
| parent | update currency exchanges rates; (diff) | |
| download | wireguard-openbsd-6b6a352c2d20c18545b1c3fe1b52751e341b4737.tar.xz wireguard-openbsd-6b6a352c2d20c18545b1c3fe1b52751e341b4737.zip | |
ahah. complex tag changes show I need to use the same algorithm as for libs
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm index c52484c84a3..264a471c285 100644 --- a/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm +++ b/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: SolverBase.pm,v 1.8 2018/06/26 09:40:33 espie Exp $ +# $OpenBSD: SolverBase.pm,v 1.9 2018/07/01 08:24:20 espie Exp $ # # Copyright (c) 2005-2018 Marc Espie <espie@openbsd.org> # @@ -231,8 +231,14 @@ sub find_in_plist sub find_in_new_source { my ($self, $solver, $state, $obj, $dep) = @_; - my $plist = OpenBSD::PackingList->from_installation($dep, - \&OpenBSD::PackingList::DependOnly); + my $plist; + + if (defined $solver->{set}{newer}{$dep}) { + $plist = $solver->{set}{newer}{$dep}->plist; + } else { + $plist = OpenBSD::PackingList->from_installation($dep, + \&OpenBSD::PackingList::DependOnly); + } if (!defined $plist) { $state->errsay("Can't read plist for #1", $dep); } |