diff options
| author | jkh <jkh@FreeBSD.org> | 1999-05-27 10:32:50 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-05-27 10:32:50 +0000 |
| commit | 4e040793c0e05bef154e78a09e4b935ec7211c08 (patch) | |
| tree | cba908c43d1dc405a0355ca3366a996075be6f56 /usr.sbin/sysinstall/index.c | |
| parent | 5f3f513bc6580435bbbd98c35680c067ddc41886 (diff) | |
| download | FreeBSD-src-4e040793c0e05bef154e78a09e4b935ec7211c08.zip FreeBSD-src-4e040793c0e05bef154e78a09e4b935ec7211c08.tar.gz | |
Do a clean-up pass on error/warning messages.
Diffstat (limited to 'usr.sbin/sysinstall/index.c')
| -rw-r--r-- | usr.sbin/sysinstall/index.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index 48f34f7..24d0a3d 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.66 1999/05/14 12:15:32 jkh Exp $ + * $Id: index.c,v 1.67 1999/05/15 14:34:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -634,19 +634,11 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) *cp2 = '\0'; if ((tmp2 = index_search(top, cp, NULL)) != NULL) { status = index_extract(dev, top, tmp2, TRUE); - if (DITEM_STATUS(status) != DITEM_SUCCESS) { - if (variable_get(VAR_NO_CONFIRM)) - msgNotify("Loading of dependant package %s failed", cp); - else - msgConfirm("Loading of dependant package %s failed", cp); - } - } - else if (!package_exists(cp)) { - if (variable_get(VAR_NO_CONFIRM)) - msgNotify("Warning: %s is a required package but was not found.", cp); - else - msgConfirm("Warning: %s is a required package but was not found.", cp); + if (DITEM_STATUS(status) != DITEM_SUCCESS) + msgCNotify("Loading of dependant package %s failed", cp); } + else if (!package_exists(cp)) + msgCNotify("Warning: %s is a required package but was not found.", cp); if (cp2) cp = cp2 + 1; else |
