diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2019-09-04 12:27:39 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2019-09-04 12:27:39 +0000 |
| commit | 3b7be44fbd14b7474c7c2ae42871c66de17ba46d (patch) | |
| tree | 9cd6fdc10190e72e97247507f545eb0ff281bd27 /usr.sbin/pkg_add | |
| parent | 30c9dffe91c2f6c86b6993dfee66b6c5f67d6fb6 (diff) | |
let collisionreport work better with FETCH_PACKAGES
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/CollisionReport.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm index 201969af860..b3f10f5cfdf 100644 --- a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm +++ b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: CollisionReport.pm,v 1.47 2018/02/27 22:46:53 espie Exp $ +# $OpenBSD: CollisionReport.pm,v 1.48 2019/09/04 12:27:38 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # @@ -57,6 +57,9 @@ sub find_collisions } for my $pkg (installed_packages()) { $state->say("Looking for collisions in #1", $pkg) if $verbose; + # XXX in -n mode, some stuff is not really there + # avoid warnings + next unless -d installed_info($pkg); my $plist = OpenBSD::PackingList->from_installation($pkg, \&OpenBSD::PackingList::FilesOnly); next if !defined $plist; |