From acbf0e15da0c38d3de07e304ca7ecb64b0136978 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Mon, 28 Dec 2009 19:29:00 +0000 Subject: an actual difference between -r and -u. If we replace, don't look as hard for conflict matching. --- usr.sbin/pkg_add/OpenBSD/Update.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index 669092c45e1..3e70756a14f 100644 --- a/usr.sbin/pkg_add/OpenBSD/Update.pm +++ b/usr.sbin/pkg_add/OpenBSD/Update.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Update.pm,v 1.121 2009/12/26 16:58:55 espie Exp $ +# $OpenBSD: Update.pm,v 1.122 2009/12/28 19:28:59 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie # @@ -118,7 +118,8 @@ sub process_handle # because of conflicts, in which case the pkgpath + # conflict should be enough to "match". for my $n ($set->newer) { - if ($n->location->update_info->match_pkgpath($plist) && + if (($state->{hard_replace} || + $n->location->update_info->match_pkgpath($plist)) && $n->plist->conflict_list->conflicts_with($sname)) { $self->add_handle($set, $h, $n); return 1; -- cgit v1.2.3