summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/OpenBSD
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2009-11-15 09:01:56 +0000
committerMarc Espie <espie@cvs.openbsd.org>2009-11-15 09:01:56 +0000
commitd0923cd632ef93c41e58d3d5fbfedaf72f7de1c0 (patch)
tree874547069d6d0dd4e015c35d267240fceafb9095 /usr.sbin/pkg_add/OpenBSD
parenta826ac6e18e54109f0feca6836253e8f2f54222a (diff)
start categorizing stuff as error messages that should be error messages
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/CollisionReport.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm
index 948f9a42147..dacd3539111 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.25 2009/11/14 21:04:02 espie Exp $
+# $OpenBSD: CollisionReport.pm,v 1.26 2009/11/15 09:01:55 espie Exp $
#
# Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
#
@@ -76,13 +76,13 @@ sub collision_report($$)
my $clueless_bat2;
my $found = 0;
- $state->say("Collision: the following files already exist");
+ $state->errsay("Collision: the following files already exist");
if (!$state->{defines}->{dontfindcollisions}) {
my $bypkg = find_collisions(\%todo, $state);
for my $pkg (sort keys %$bypkg) {
for my $item (sort @{$bypkg->{$pkg}}) {
$found++;
- $state->say("\t$item ($pkg)");
+ $state->errsay("\t$item ($pkg)");
}
if ($pkg =~ m/^(?:partial\-|borked\.\d+$)/o) {
$clueless_bat = $pkg;
@@ -99,23 +99,23 @@ sub collision_report($$)
my $old = $todo{$item};
my $d = $old->new($destdir.$item);
if ($d->equals($old)) {
- $state->say("\t$item (same checksum)");
+ $state->errsay("\t$item (same checksum)");
} else {
- $state->say("\t$item (different checksum)");
+ $state->errsay("\t$item (different checksum)");
}
} else {
- $state->say("\t$item");
+ $state->errsay("\t$item");
}
}
}
if (defined $clueless_bat) {
- $state->print("The package name $clueless_bat suggests that a former installation\n",
+ $state->errprint("The package name $clueless_bat suggests that a former installation\n",
"of a similar package got interrupted. It is likely that\n",
"\tpkg_delete $clueless_bat\n",
"will solve the problem\n");
}
if (defined $clueless_bat2) {
- $state->print("The package name $clueless_bat2 suggests remaining libraries\n",
+ $state->errprint("The package name $clueless_bat2 suggests remaining libraries\n",
"from a former package update. It is likely that\n",
"\tpkg_delete $clueless_bat2\n".
"will solve the problem\n");