[src/netbsd-1-5]: src/usr.sbin/pkg_install/add Pull up revision 1.58 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/d2427249b90e
branches:  netbsd-1-5
changeset: 491030:d2427249b90e
user:      he <he%NetBSD.org@localhost>
date:      Fri Mar 30 22:42:33 2001 +0000

description:
Pull up revision 1.58 (requested by hubertf):
  Make pkg_add not abort when it should not.

diffstat:

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

diffs (25 lines):

diff -r 341234cd7ff5 -r d2427249b90e usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Fri Mar 30 22:40:56 2001 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Fri Mar 30 22:42:33 2001 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.52.2.5 2001/03/20 17:56:19 he Exp $      */
+/*     $NetBSD: perform.c,v 1.52.2.6 2001/03/30 22:42:33 he 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.52.2.5 2001/03/20 17:56:19 he Exp $");
+__RCSID("$NetBSD: perform.c,v 1.52.2.6 2001/03/30 22:42:33 he 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 */
        }