summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/OpenBSD
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2008-03-03 16:48:33 +0000
committerMarc Espie <espie@cvs.openbsd.org>2008-03-03 16:48:33 +0000
commitf49ac8c2d51506de5146e7722e2ebb53d37be0d5 (patch)
tree53dc578cb0a479c921fac1243706c6d6b553abb0 /usr.sbin/pkg_add/OpenBSD
parentfce6a2c3e8ebe02ea2e73fe41f4e968a946a28d9 (diff)
fix utterly confusing message for updates.
okay bernd@/deraadt@
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Delete.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm
index b053a94597d..9c663d72a36 100644
--- a/usr.sbin/pkg_add/OpenBSD/Delete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Delete.pm,v 1.71 2007/06/30 11:35:21 espie Exp $
+# $OpenBSD: Delete.pm,v 1.72 2008/03/03 16:48:32 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -493,6 +493,7 @@ sub delete
if (!defined $orig) {
Fatal "\@sample element does not reference a valid file\n";
}
+ my $action = $state->{replacing} ? "check" : "remove";
my $origname = $orig->realname($state);
if (! -e $realname) {
$state->print("File $realname does not exist\n");
@@ -511,7 +512,7 @@ sub delete
if ($state->{quick}) {
unless ($state->{extra}) {
$self->mark_dir($state);
- $state->print("You should also remove $realname\n");
+ $state->print("You should also $action $realname\n");
return;
}
} else {
@@ -521,7 +522,7 @@ sub delete
} else {
unless ($state->{extra}) {
$self->mark_dir($state);
- $state->print("You should also remove $realname (which was modified)\n");
+ $state->print("You should also $action $realname (which was modified)\n");
return;
}
}