diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2014-02-01 10:55:38 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2014-02-01 10:55:38 +0000 |
| commit | 7a0abc6020742b7f8a4bc852dc7e96454830c804 (patch) | |
| tree | 8b8fd8f88c9f9aa6382bfec663657dfc38a6f3a2 | |
| parent | 178fce67b27b9548d472561036f92f6b46c2544c (diff) | |
no need to test for plist, we get the conflict_list since we have update_info
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index 2b7f763a05f..4d9c8145de0 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.159 2014/01/24 11:41:23 espie Exp $ +# $OpenBSD: Update.pm,v 1.160 2014/02/01 10:55:37 espie Exp $ # # Copyright (c) 2004-2014 Marc Espie <espie@openbsd.org> # @@ -142,8 +142,7 @@ sub process_handle for my $n ($set->newer) { if (($state->{hard_replace} || $n->location->update_info->match_pkgpath($plist)) && - defined $n->plist && - $n->plist->conflict_list->conflicts_with($sname)) { + $n->conflict_list->conflicts_with($sname)) { $self->add_handle($set, $h, $n); return 1; } |