From d5b26286d5d56be00d1cc56a3a3e6e7115998305 Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Tue, 5 Oct 2004 19:52:45 +0000
Subject: make a list of all conflicts.

---
 usr.sbin/pkg_add/OpenBSD/PkgCfl.pm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
index aed27e04558..dab2affb809 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCfl.pm,v 1.5 2004/09/24 08:46:04 espie Exp $
+# $OpenBSD: PkgCfl.pm,v 1.6 2004/10/05 19:52:44 espie Exp $
 #
 # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
 #
@@ -57,13 +57,11 @@ sub make_conflict_list($)
 sub conflicts_with
 {
 	my ($self, @pkgnames) = @_;
+	my @l = ();
 	for my $cfl (@$self) {
-		my @l = &$cfl(@pkgnames);
-		if (@l) {
-			return @l;
-		}
+		push(@l, &$cfl(@pkgnames));
 	}
-	return 0;
+	return @l;
 }
 
 1;
-- 
cgit v1.2.3