From 7a0abc6020742b7f8a4bc852dc7e96454830c804 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sat, 1 Feb 2014 10:55:38 +0000 Subject: no need to test for plist, we get the conflict_list since we have update_info --- usr.sbin/pkg_add/OpenBSD/Update.pm | 5 ++--- 1 file 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 # @@ -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; } -- cgit v1.2.3