diff options
| author |   espie <espie@openbsd.org> | 2018-12-21 14:04:19 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2018-12-21 14:04:19 +0000 |
| commit | ff77971f2bb50cf5be61ca8db4e8eeb5c81e8fe2 (patch) | |
| tree | 2318a260b45e06161d43734953320538c8effc2c | |
| parent | Do PAT setup earlier such that mapping the framebuffer WC works at the (diff) | |
| download | wireguard-openbsd-ff77971f2bb50cf5be61ca8db4e8eeb5c81e8fe2.tar.xz wireguard-openbsd-ff77971f2bb50cf5be61ca8db4e8eeb5c81e8fe2.zip | |
do not try merging packages that are already kept, the forward dependency
check did fail
(noticed by bluhm@)
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index e59b39907c0..83d2c87e6b1 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.107 2018/12/13 12:48:53 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.108 2018/12/21 14:04:19 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -553,6 +553,10 @@ sub check_forward_dependencies if (!$state->defines('dontmerge')) { my $okay = 1; for my $m (keys %$bad) { + if ($set->{kept}{$m}) { + $okay = 0; + next; + } if ($set->try_merging($m, $state)) { $no_merge = 0; } else { |