diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-28 19:29:00 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-28 19:29:00 +0000 |
| commit | acbf0e15da0c38d3de07e304ca7ecb64b0136978 (patch) | |
| tree | 0ea6414510dd6a7d4fdb3c05f3c8b20dac2457c9 /usr.sbin | |
| parent | dbc26588e69e626ff88755f5442453a956e79be3 (diff) | |
an actual difference between -r and -u. If we replace, don't look as hard
for conflict matching.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 5 |
1 files changed, 3 insertions, 2 deletions
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 <espie@openbsd.org> # @@ -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; |