summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2009-11-14 08:11:06 +0000
committerMarc Espie <espie@cvs.openbsd.org>2009-11-14 08:11:06 +0000
commitff0e78f68df5bb5c52b0aa72d7886ba7cbe12d59 (patch)
treea53a52d93231d9f65a7144780ab8ae5124b0e217 /usr.sbin/pkg_add
parent2419480689f49d231c432eeea973d6586b915345 (diff)
fix. noticed by sthen@
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/CollisionReport.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm
index 7d8db5b02c1..754d86617dc 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.22 2009/11/11 13:00:40 espie Exp $
+# $OpenBSD: CollisionReport.pm,v 1.23 2009/11/14 08:11:05 espie Exp $
#
# Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
#
@@ -25,7 +25,8 @@ use OpenBSD::Vstat;
sub find_collisions
{
- my ($todo, $verbose) = @_;
+ my ($todo, $state) = @_;
+ my $verbose = $state->{verbose};
my $bypkg = {};
for my $name (keys %$todo) {
my $p = OpenBSD::Vstat::vexists $name;
@@ -76,7 +77,7 @@ sub collision_report($$)
$state->say("Collision: the following files already exist");
if (!$state->{defines}->{dontfindcollisions}) {
- my $bypkg = find_collisions(\%todo, $state->{verbose});
+ my $bypkg = find_collisions(\%todo, $state);
for my $pkg (sort keys %$bypkg) {
for my $item (sort @{$bypkg->{$pkg}}) {
$found++;