[src/trunk]: src/usr.sbin/pkg_install/add If a package is already installed, ...

[hubertf <hubertf%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb021c583313
branches:  trunk
changeset: 507647:eb021c583313
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Wed Mar 28 12:46:01 2001 +0000

description:
If a package is already installed, this is *not* a fatal error. Do not
report error code 1, as this will abort installing pkgs if a dependency is
already found installed under certain conditions.

diffstat:

 usr.sbin/pkg_install/add/perform.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 69edb664e0cc -r eb021c583313 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Wed Mar 28 11:12:19 2001 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Wed Mar 28 12:46:01 2001 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.57 2001/03/18 03:20:28 hubertf Exp $     */
+/*     $NetBSD: perform.c,v 1.58 2001/03/28 12:46:01 hubertf Exp $     */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.57 2001/03/18 03:20:28 hubertf Exp $");
+__RCSID("$NetBSD: perform.c,v 1.58 2001/03/28 12:46:01 hubertf Exp $");
 #endif
 #endif
 
@@ -316,7 +316,6 @@
        (void) snprintf(LogDir, sizeof(LogDir), "%s/%s", dbdir, PkgName);
        if ((isdir(LogDir) || islinktodir(LogDir)) && !Force) {
                warnx("package `%s' already recorded as installed", PkgName);
-               code = 1;
                goto success;   /* close enough for government work */
        }