summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/index.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-10-22 17:18:36 +0000
committerjkh <jkh@FreeBSD.org>1995-10-22 17:18:36 +0000
commit212c8f1ba7c62342e90ba294aac4b2e0e1faed00 (patch)
tree264780a26d573e1b062a3d5907d3060d9cddb874 /usr.sbin/sysinstall/index.c
parent2b02753359669b49ee92eeb7a287b8155864a203 (diff)
downloadFreeBSD-src-212c8f1ba7c62342e90ba294aac4b2e0e1faed00.zip
FreeBSD-src-212c8f1ba7c62342e90ba294aac4b2e0e1faed00.tar.gz
Style changes. Clear the screen before a lot of error dialogs so that they
don't bogusly restore the screen to the message that was the cause of the abort. That resulted in lots of weird flickering dialog boxes that appeared to be displayed out of sequence.
Diffstat (limited to 'usr.sbin/sysinstall/index.c')
-rw-r--r--usr.sbin/sysinstall/index.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index 8b9dcfc..d7c9c49 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.14 1995/10/21 14:06:44 jkh Exp $
+ * $Id: index.c,v 1.15 1995/10/22 01:32:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -456,6 +456,7 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
}
}
if (!n && plist) {
+ dialog_clear();
msgConfirm("The %s menu is empty.", top->name);
return RET_DONE;
}
@@ -539,8 +540,9 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
pos = scroll = 0;
index_menu(menu, plist, &pos, &scroll);
}
- else
+ else {
msgConfirm("Search string: %s yielded no hits.", cp);
+ }
}
}
else {
@@ -557,13 +559,8 @@ index_extract(Device *dev, PkgNodePtr plist)
int status = RET_SUCCESS;
for (tmp = plist->kids; tmp; tmp = tmp->next) {
- if (package_extract(dev, tmp->name) != RET_SUCCESS) {
- if (variable_get(VAR_NO_CONFIRM))
- msgNotify("Unable to locate package %s..", tmp->name);
- else
- msgConfirm("Unable to locate package %s..", tmp->name);
+ if (package_extract(dev, tmp->name) != RET_SUCCESS)
status = RET_FAIL;
- }
}
return status;
}
OpenPOWER on IntegriCloud