diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-02-06 17:02:49 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-02-06 17:02:49 +0000 |
| commit | 8f69be0ca5af9446d71d557a9c95833bacc0d281 (patch) | |
| tree | e204b1652d47ec803fbbf6eaa975bdebedea0fbf /usr.sbin/pkg_add | |
| parent | 962e0273ff7cff78549cc6847fbf06680a0e10cc (diff) | |
don't abort if that info is not yet available...
Diffstat (limited to 'usr.sbin/pkg_add')
| -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; |