diff options
| author |   espie <espie@openbsd.org> | 2019-05-23 22:33:29 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2019-05-23 22:33:29 +0000 |
| commit | b21d7bd479d13879a5b1daabaf19032b4822e271 (patch) | |
| tree | 5dc5cde4d158a084ab3d3f1deb932cd8bcc53961 /usr.sbin/pkg_add/OpenBSD | |
| parent | unbreak build, okay nicm@ (diff) | |
| download | wireguard-openbsd-b21d7bd479d13879a5b1daabaf19032b4822e271.tar.xz wireguard-openbsd-b21d7bd479d13879a5b1daabaf19032b4822e271.zip | |
look for tag in self first, solves a fringe case where
we could find the dependency in another version of the
the same package first, and error out (see
special case found_in_self).
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 94dd261d155..534b8e1ef35 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.171 2018/06/26 09:40:33 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.172 2019/05/23 22:33:29 espie Exp $ # # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org> # @@ -403,9 +403,9 @@ sub solve_handle_tags my $okay = 1; $solver->{tag_finder} //= OpenBSD::lookup::tag->new($solver, $state); for my $tag (@{$plist->{tags}}) { + $solver->find_in_self($plist, $state, $tag) || $solver->{tag_finder}->lookup($solver, - $solver->{to_register}{$h}, $state, $tag) - || $solver->find_in_self($plist, $state, $tag); + $solver->{to_register}{$h}, $state, $tag); if (!$solver->verify_tag($tag, $state, $plist, $h->{is_old})) { $okay = 0; } |