diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-07-02 22:36:14 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-07-02 22:36:14 +0000 |
| commit | 7050843886487f190e228c55af1091e5a0999d25 (patch) | |
| tree | c7cd6e48b443088758dea08b3e6465bc4c46b4d9 /usr.sbin/sysinstall/index.c | |
| parent | fc9961b5ddcfa4ebacfb044c9b65c3edcbe7eb9b (diff) | |
| download | src-7050843886487f190e228c55af1091e5a0999d25.tar.gz src-7050843886487f190e228c55af1091e5a0999d25.zip | |
Notes
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 6f1fc90fa30b..7a98511eaaa4 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 |