Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
hubertf 2001-03-28 12:46:01 +00:00
parent a1560723b0
commit 6890588691
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/pkg_install/add/perform.c
View File

@ -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> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp"; static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else #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
#endif #endif
@ -316,7 +316,6 @@ pkg_do(char *pkg)
(void) snprintf(LogDir, sizeof(LogDir), "%s/%s", dbdir, PkgName); (void) snprintf(LogDir, sizeof(LogDir), "%s/%s", dbdir, PkgName);
if ((isdir(LogDir) || islinktodir(LogDir)) && !Force) { if ((isdir(LogDir) || islinktodir(LogDir)) && !Force) {
warnx("package `%s' already recorded as installed", PkgName); warnx("package `%s' already recorded as installed", PkgName);
code = 1;
goto success; /* close enough for government work */ goto success; /* close enough for government work */
} }