Consistency in error reports.
authorespie <espie@openbsd.org>
Wed, 26 Apr 2000 15:28:14 +0000 (15:28 +0000)
committerespie <espie@openbsd.org>
Wed, 26 Apr 2000 15:28:14 +0000 (15:28 +0000)
*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...

usr.sbin/pkg_install/lib/plist.c

index 43def33..21f46e9 100644 (file)
@@ -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;