summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_install/lib
diff options
context:
space:
mode:
authorgrant <grant@NetBSD.org>2003-04-14 23:42:21 +0000
committergrant <grant@NetBSD.org>2003-04-14 23:42:21 +0000
commit6dbbe09cdfd28062d10c6a9cd0db06f38c3f6e63 (patch)
tree2e0b9ae3d0a6eea2878bdec98a75a6dda5bd395d /usr.sbin/pkg_install/lib
parent7b402ff9df8dc6c8ee97fb72842a21af57000ce4 (diff)
in delete_package(), always warn if there is a checksum mismatch,
improve text.
Diffstat (limited to 'usr.sbin/pkg_install/lib')
-rw-r--r--usr.sbin/pkg_install/lib/plist.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 5e1ff5b2bd8..362a56a0a5c 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -1,11 +1,11 @@
-/* $NetBSD: plist.c,v 1.37 2003/01/05 21:49:59 agc Exp $ */
+/* $NetBSD: plist.c,v 1.38 2003/04/14 23:42:21 grant Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp";
#else
-__RCSID("$NetBSD: plist.c,v 1.37 2003/01/05 21:49:59 agc Exp $");
+__RCSID("$NetBSD: plist.c,v 1.38 2003/04/14 23:42:21 grant Exp $");
#endif
#endif
@@ -377,10 +377,8 @@ delete_package(Boolean ign_err, Boolean nukedirs, package_t *pkg)
if ((cp = MD5File(tmp, buf)) != NULL) {
/* Mismatch? */
if (strcmp(cp, p->next->name + ChecksumHeaderLen) != 0) {
- if (Verbose) {
- printf("%s fails original MD5 checksum - %s\n",
- tmp, Force ? "deleted anyway." : "not deleted.");
- }
+ printf("original MD5 checksum failed, %s: %s\n",
+ Force ? "deleting anyway" : "not deleting", tmp);
if (!Force) {
fail = FAIL;
continue;