diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-09-02 10:28:44 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-09-02 10:28:44 +0000 |
| commit | 4891732351ca5d799179b8ed72536024ee269ea5 (patch) | |
| tree | d680c1662f82621c189b6069bdae199a22ca40ee /pkgtools | |
| parent | 951e5388d7a66348b22df8dcbaee12374e4836b2 (diff) | |
| download | pkgsrc-4891732351ca5d799179b8ed72536024ee269ea5.tar.gz | |
pkg_install-20130902: Fix 'pkg_add -f'.
Remove incorrect return value when in force mode, which was causing pkg_add
to exit with failure even though the operation completed successfully. This
also fixes the case where 'pkg_add -uf' would leave an update in an
inconsistent state.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 7 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 69e7c088605..db77a57c3aa 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.197 2013/06/05 18:20:55 riastradh Exp $ +# $NetBSD: Makefile,v 1.198 2013/09/02 10:28:44 jperkin Exp $ # Notes to package maintainers: # @@ -7,7 +7,6 @@ # change in the pkg_* tools that pkgsrc relies on for proper operation. DISTNAME= pkg_install-${VERSION} -PKGREVISION= 1 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index fcafb16a5a8..88c9d48b11e 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.104 2013/08/21 11:46:02 jperkin Exp $ */ +/* $NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif -__RCSID("$NetBSD: perform.c,v 1.104 2013/08/21 11:46:02 jperkin Exp $"); +__RCSID("$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $"); /*- * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> @@ -413,9 +413,6 @@ check_already_installed(struct pkg_task *pkg) return 1; } - if (Force) - return 1; - /* We can only arrive here for explicitly requested packages. */ if (!Automatic && is_automatic_installed(pkg->pkgname)) { if (Fake || diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 8f34d2c9f72..8c92b87919d 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.165 2013/01/31 10:25:30 wiz Exp $ */ +/* $NetBSD: version.h,v 1.166 2013/09/02 10:28:44 jperkin Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -27,6 +27,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION 20130131 +#define PKGTOOLS_VERSION 20130902 #endif /* _INST_LIB_VERSION_H_ */ |