diff options
| author | jkh <jkh@FreeBSD.org> | 1999-07-02 22:36:14 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-07-02 22:36:14 +0000 |
| commit | 09d2fcf7ce9c557990687ca35240e537d4bd3ce3 (patch) | |
| tree | bd8d251c407636bd37bfe867581ad952c8609cf5 /usr.sbin/sysinstall/index.c | |
| parent | f83d7679292bf0c56becaeb56d8fff81d2cec1c5 (diff) | |
| download | FreeBSD-src-09d2fcf7ce9c557990687ca35240e537d4bd3ce3.zip FreeBSD-src-09d2fcf7ce9c557990687ca35240e537d4bd3ce3.tar.gz | |
Eliminate some varargs abuse.
Diffstat (limited to 'usr.sbin/sysinstall/index.c')
| -rw-r--r-- | usr.sbin/sysinstall/index.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index 6f1fc90..7a98511 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.68 1999/05/27 10:32:45 jkh Exp $ + * $Id: index.c,v 1.69 1999/06/28 02:37:34 billf Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -637,11 +637,19 @@ 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) - msgCNotify("Loading of dependant package %s failed", cp); + 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); } - else if (!package_exists(cp)) - msgCNotify("Warning: %s is a required package but was not found.", cp); if (cp2) cp = cp2 + 1; else |
