diff options
| author | dillo <dillo> | 2005-12-08 19:41:04 +0000 |
|---|---|---|
| committer | dillo <dillo> | 2005-12-08 19:41:04 +0000 |
| commit | 82fea7d41ec49e285a047b90864e9edac52614ad (patch) | |
| tree | 6e73a93da9744121317535af44c27a38f0805589 /pkgtools/pkg_install | |
| parent | 4f956af36c12df78f0bc8df9e052cef8dc0c1b7f (diff) | |
| download | pkgsrc-82fea7d41ec49e285a047b90864e9edac52614ad.tar.gz | |
sync with src (revision 1.115):
(pkg_do) When marking already installed package as manually installed,
only print message if we succeeded.
Noted by wiz.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 95b5935679f..b9a4a7de4e1 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.35 2005/11/22 15:44:59 ben Exp $ */ +/* $NetBSD: perform.c,v 1.36 2005/12/08 19:41:04 dillo Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -14,7 +14,7 @@ #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.35 2005/11/22 15:44:59 ben Exp $"); +__RCSID("$NetBSD: perform.c,v 1.36 2005/12/08 19:41:04 dillo Exp $"); #endif #endif @@ -511,10 +511,10 @@ pkg_do(const char *pkg, lpkg_head_t *pkgs) /* See if this package (exact version) is already registered */ if ((isdir(LogDir) || islinktodir(LogDir)) && !Force) { if (!Automatic && is_automatic_installed(LogDir)) { - mark_as_automatic_installed(LogDir, 0); - warnx("package `%s' was already installed as " - "dependency, now marked as installed manually", - PkgName); + if (mark_as_automatic_installed(LogDir, 0) == 0) + warnx("package `%s' was already installed as " + "dependency, now marked as installed " + "manually", PkgName); } else { warnx("package `%s' already recorded as installed", PkgName); |