Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/pkg_install/add If "-f" is given, don't set errc on...



details:   https://anonhg.NetBSD.org/src/rev/bfecb5615186
branches:  trunk
changeset: 534021:bfecb5615186
user:      toshii <toshii%NetBSD.org@localhost>
date:      Sat Jul 13 16:38:00 2002 +0000

description:
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 a5eed6939a36 -r bfecb5615186 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sat Jul 13 13:40:28 2002 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Sat Jul 13 16:38:00 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.67 2002/07/09 04:35:30 yamt Exp $        */
+/*     $NetBSD: perform.c,v 1.68 2002/07/13 16:38:00 toshii 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.67 2002/07/09 04:35:30 yamt Exp $");
+__RCSID("$NetBSD: perform.c,v 1.68 2002/07/13 16:38:00 toshii Exp $");
 #endif
 #endif
 
@@ -603,7 +603,7 @@
                                if (!done) {
                                        done = installprereq(pkg, p->name, &errc);
                                }
-                               if (!done) {
+                               if (!done && !Force) {
                                        errc = 1;
                                }
                        }



Home | Main Index | Thread Index | Old Index