From 63ef9847d5a12fc5aac023acd80f24197a281121 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 8 Sep 1998 21:54:01 +0000 Subject: [PATCH] Fix broken package dependence handling mentioned by Brook Milligan on "tech-pkg@netbsd.org". --- usr.sbin/pkg_install/add/perform.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index f4c579401a4b..7e579afff437 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,11 +1,11 @@ -/* $NetBSD: perform.c,v 1.19 1998/08/28 00:35:51 hubertf Exp $ */ +/* $NetBSD: perform.c,v 1.20 1998/09/08 21:54:01 tron Exp $ */ #include #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.19 1998/08/28 00:35:51 hubertf Exp $"); +__RCSID("$NetBSD: perform.c,v 1.20 1998/09/08 21:54:01 tron Exp $"); #endif #endif @@ -277,11 +277,12 @@ pkg_do(char *pkg) ++code; } } - else - warnx("add of dependency `%s' failed%s", - p->name, Force ? " (proceeding anyway)" : "!"); - if (!Force) - ++code; + else { + warnx("add of dependency `%s' failed%s", + p->name, Force ? " (proceeding anyway)" : "!"); + if (!Force) + ++code; + } } else if ((cp = fileGetURL(pkg, p->name)) != NULL) { if (Verbose)