summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2000-04-26 15:28:15 +0000
committerMarc Espie <espie@cvs.openbsd.org>2000-04-26 15:28:15 +0000
commit3406d8ba0503e30fd3bdcbe77357139547837e9d (patch)
treec4b3ce13a52fc31a45b3e26911940db2d41f3e5a
parent6320a70255f58ef53cb0ea24ced14c32f0fdab57 (diff)
Consistency in error reports.
*always* tell them MD5Sum fails, because later, pkg_delete will complain about a bad package anyway, and the poor user won't be able to figure out what went wrong, and it's obviously too late since the package is gone already...
-rw-r--r--usr.sbin/pkg_install/lib/plist.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 43def33d133..21f46e9f7ab 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: plist.c,v 1.7 2000/04/05 17:26:47 espie Exp $ */
+/* $OpenBSD: plist.c,v 1.8 2000/04/26 15:28:14 espie Exp $ */
#ifndef lint
-static const char *rcsid = "$OpenBSD: plist.c,v 1.7 2000/04/05 17:26:47 espie Exp $";
+static const char *rcsid = "$OpenBSD: plist.c,v 1.8 2000/04/26 15:28:14 espie Exp $";
#endif
/*
@@ -342,8 +342,7 @@ delete_package(Boolean ign_err, Boolean nukedirs, package_t *pkg)
if ((cp = MD5File(tmp, buf)) != NULL) {
/* Mismatch? */
if (strcmp(cp, p->next->name + 4)) {
- if (Verbose)
- printf("%s fails original MD5 checksum - %s\n",
+ printf("%s fails original MD5 checksum - %s\n",
tmp, Force ? "deleted anyway." : "not deleted.");
if (!Force) {
fail = FAIL;