diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2008-03-08 11:41:43 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2008-03-08 11:41:43 +0000 |
| commit | be80e263ef76a0d346d1e751cede81f67c3aafc7 (patch) | |
| tree | 27c3609a86cc833b39007ec807680e276c2c0785 /usr.sbin | |
| parent | 4dcc11f506add98fccd7b9eeea0132983e3951e0 (diff) | |
tweak messages mentioning checksums so that they mention checksums, not
specifics like md5, since that's likely to change.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 12 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete.1 | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index 9c663d72a36..65394299e29 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.72 2008/03/03 16:48:32 espie Exp $ +# $OpenBSD: Delete.pm,v 1.73 2008/03/08 11:41:42 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -396,17 +396,17 @@ sub delete unless (defined($self->{link}) or $self->{nochecksum} or $state->{quick}) { if (!defined $self->{md5}) { print "Problem: ", $self->fullname, - " does not have an md5 checksum\n"; + " does not have a checksum\n"; print "NOT deleting: $realname\n"; - $state->print("Couldn't delete $realname (no md5)\n"); + $state->print("Couldn't delete $realname (no checksum)\n"); return; } my $md5 = OpenBSD::md5::fromfile($realname); if ($md5 ne $self->{md5}) { - print "Problem: md5 doesn't match for ", + print "Problem: checksum doesn't match for ", $self->fullname, "\n"; print "NOT deleting: $realname\n"; - $state->print("Couldn't delete $realname (bad md5)\n"); + $state->print("Couldn't delete $realname (bad checksum)\n"); $self->do_not_delete($state); return; } @@ -505,7 +505,7 @@ sub delete } if (!defined $orig->{md5}) { - $state->print("Couldn't delete $realname (no md5)\n"); + $state->print("Couldn't delete $realname (no checksum)\n"); return; } diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index 907fd843525..7586493e430 100644 --- a/usr.sbin/pkg_add/pkg_add.1 +++ b/usr.sbin/pkg_add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_add.1,v 1.69 2008/01/26 16:38:52 landry Exp $ +.\" $OpenBSD: pkg_add.1,v 1.70 2008/03/08 11:41:42 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -15,7 +15,7 @@ .\" Jordan K. Hubbard .\" .\" -.Dd $Mdocdate: January 26 2008 $ +.Dd $Mdocdate: March 8 2008 $ .Dt PKG_ADD 1 .Os .Sh NAME @@ -283,7 +283,7 @@ symbolic links are resolved, and package installation stops at .Cm @endfake marker. .It Fl q -Replace package quickly; do not bother checking MD5s before removing files. +Replace package quickly; do not bother with checksums before removing files. .It Fl r Replace existing packages. .Nm diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1 index b1fb901bd9d..da01ea560eb 100644 --- a/usr.sbin/pkg_add/pkg_delete.1 +++ b/usr.sbin/pkg_add/pkg_delete.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_delete.1,v 1.25 2007/10/31 14:45:06 jmc Exp $ +.\" $OpenBSD: pkg_delete.1,v 1.26 2008/03/08 11:41:42 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -15,7 +15,7 @@ .\" Jordan K. Hubbard .\" .\" -.Dd $Mdocdate: October 31 2007 $ +.Dd $Mdocdate: March 8 2008 $ .Dt PKG_DELETE 1 .Os .Sh NAME @@ -91,7 +91,7 @@ may ask questions to the user if faced with difficult decisions. Don't actually deinstall a package, just report the steps that would be taken if it were. .It Fl q -Delete package quickly, do not bother checking MD5s before removing files. +Delete package quickly, do not bother with checksums before removing files. .It Fl v Turn on verbose output. Several |