From ce491d8c9c208c49ff35b3880e6a9f2a4b6006f9 Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Fri, 21 Dec 2018 14:04:20 +0000
Subject: do not try merging packages that are already kept, the forward
 dependency check did fail

(noticed by bluhm@)
---
 usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/pkg_add')

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 {
-- 
cgit v1.2.3