diff options
| author |   espie <espie@openbsd.org> | 2012-02-06 17:02:48 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2012-02-06 17:02:48 +0000 |
| commit | c3384a8a0479c73150eae9e49b580546ea5792dc (patch) | |
| tree | 151bbbbc0d30bf285b27ab4a3d5eb4a132fbd316 | |
| parent | Improve the ICMPv6 direction check (diff) | |
| download | wireguard-openbsd-c3384a8a0479c73150eae9e49b580546ea5792dc.tar.xz wireguard-openbsd-c3384a8a0479c73150eae9e49b580546ea5792dc.zip | |
don't abort if that info is not yet available...
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index ef4db8a822a..11f7e82f368 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.150 2011/08/26 08:46:10 espie Exp $ +# $OpenBSD: Update.pm,v 1.151 2012/02/06 17:02:48 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # @@ -132,6 +132,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)) { $self->add_handle($set, $h, $n); return 1; |