From e05672bb19edc52739956703d8f305f78718c321 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Thu, 15 Oct 1998 06:50:43 +0000 Subject: [PATCH] snuff warning message if package is not found in INDEX but is found to be already installed anyway. --- release/sysinstall/index.c | 4 ++-- usr.sbin/sysinstall/index.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index 51619674439b..5d44d651ac11 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: index.c,v 1.55 1998/09/23 12:13:47 jkh Exp $ + * $Id: index.c,v 1.56 1998/10/13 07:31:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -601,7 +601,7 @@ index_extract_one(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) msgConfirm("Loading of dependant package %s failed", cp); } } - else { + else if (!package_exists(cp)) { if (variable_get(VAR_NO_CONFIRM)) msgNotify("Warning: %s is a required package but was not found.", cp); else diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index 51619674439b..5d44d651ac11 100644 --- a/usr.sbin/sysinstall/index.c +++ b/usr.sbin/sysinstall/index.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: index.c,v 1.55 1998/09/23 12:13:47 jkh Exp $ + * $Id: index.c,v 1.56 1998/10/13 07:31:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -601,7 +601,7 @@ index_extract_one(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) msgConfirm("Loading of dependant package %s failed", cp); } } - else { + else if (!package_exists(cp)) { if (variable_get(VAR_NO_CONFIRM)) msgNotify("Warning: %s is a required package but was not found.", cp); else