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

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

details:   https://anonhg.NetBSD.org/src/rev/ca094a9d9003
branches:  netbsd-1-6
changeset: 528497:ca094a9d9003
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Jul 21 04:22:11 2002 +0000

description:
Pull up revision 1.68 (requested by yamt in ticket #529):
If "-f" is given, don't set errc on dependency add failure.
This change makes "pkg_add -f" work as it used to be.

diffstat:

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

diffs (26 lines):

diff -r 91072b0fd150 -r ca094a9d9003 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sun Jul 21 03:46:11 2002 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Sun Jul 21 04:22:11 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.63.2.1 2002/06/28 12:42:58 lukem Exp $   */
+/*     $NetBSD: perform.c,v 1.63.2.2 2002/07/21 04:22:11 lukem 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.63.2.1 2002/06/28 12:42:58 lukem Exp $");
+__RCSID("$NetBSD: perform.c,v 1.63.2.2 2002/07/21 04:22:11 lukem Exp $");
 #endif
 #endif
 
@@ -603,7 +603,7 @@
                                if (!done) {
                                        done = installprereq(pkg, p->name, &errc);
                                }
-                               if (!done) {
+                               if (!done && !Force) {
                                        errc = 1;
                                }
                        }