diff options
| author |   espie <espie@openbsd.org> | 2018-12-12 14:11:03 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2018-12-12 14:11:03 +0000 |
| commit | 7571f4eb577a9de87bf5c32ba3a7e9d087c56a55 (patch) | |
| tree | ceedfb160f3b69807a5ddc865c693439ac7caf21 | |
| parent | upon MAIL or RCPT errors, only trigger report_smtp_tx_{mail,rcpt} events if (diff) | |
| download | wireguard-openbsd-7571f4eb577a9de87bf5c32ba3a7e9d087c56a55.tar.xz wireguard-openbsd-7571f4eb577a9de87bf5c32ba3a7e9d087c56a55.zip | |
moving handles to kept means they're not affected by complete_set, which
means that they won't get their dependency information. But if they're
in kept, they're actually installed so make sure they have a location.
This will let pkg_add always follow dependencies for all sets even if
there's nothing to directly install
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index 68b125f344d..2dd5faa7c4d 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.81 2018/07/18 13:06:23 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.82 2018/12/12 14:11:03 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # @@ -280,6 +280,10 @@ sub move_kept delete $self->{older}{$h->pkgname}; delete $self->{newer}{$h->pkgname}; $self->{kept}{$h->pkgname} = $h; + if (!defined $h->{location}) { + $h->{location} = + $self->{repo}->installed->find($h->pkgname); + } $h->complete_dependency_info; $h->{update_found} = $h; } |