Fix an informational message a little and properly check status of a yes/no

question which I bollicked up in my previous commit.
This commit is contained in:
Jordan K. Hubbard 2000-12-16 05:36:10 +00:00
parent 0e3099f516
commit d97b90c7fc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=70093
5 changed files with 13 additions and 17 deletions

View File

@ -733,13 +733,11 @@ index_initialize(char *path)
msgNotify("Attempting to fetch %s file from selected media.", path);
fp = mediaDevice->get(mediaDevice, path, TRUE);
if (!fp) {
msgConfirm("Unable to get packages/INDEX file from selected media.\n"
"This may be because the packages collection is not available at\n"
"on the distribution media you've chosen (most likely an FTP site\n"
"without the packages collection mirrored). Please verify media\n"
"(or path to media) and try again. If your local site does not\n"
"carry the packages collection, then we recommend either a CD\n"
"distribution or the master distribution on ftp.freebsd.org.");
msgConfirm("Unable to get packages/INDEX file from selected media.\n\n"
"This may be because the packages collection is not available\n"
"on the distribution media you've chosen, most likely an FTP site\n"
"without the packages collection mirrored. Please verify that\n"
"your media, or your path to the media, is correct and try again.");
mediaDevice->shutdown(mediaDevice);
restorescr(w);
return DITEM_FAILURE;

View File

@ -603,7 +603,7 @@ installStandard(dialogMenuItem *self)
#endif
dialog_clear_norefresh();
if (!msgNoYes("Does this system have a USB mouse attached to it?"))
if (msgNoYes("Does this system have a USB mouse attached to it?"))
dmenuOpenSimple(&MenuMouse, FALSE);
/* Now would be a good time to checkpoint the configuration data */

View File

@ -603,7 +603,7 @@ installStandard(dialogMenuItem *self)
#endif
dialog_clear_norefresh();
if (!msgNoYes("Does this system have a USB mouse attached to it?"))
if (msgNoYes("Does this system have a USB mouse attached to it?"))
dmenuOpenSimple(&MenuMouse, FALSE);
/* Now would be a good time to checkpoint the configuration data */

View File

@ -733,13 +733,11 @@ index_initialize(char *path)
msgNotify("Attempting to fetch %s file from selected media.", path);
fp = mediaDevice->get(mediaDevice, path, TRUE);
if (!fp) {
msgConfirm("Unable to get packages/INDEX file from selected media.\n"
"This may be because the packages collection is not available at\n"
"on the distribution media you've chosen (most likely an FTP site\n"
"without the packages collection mirrored). Please verify media\n"
"(or path to media) and try again. If your local site does not\n"
"carry the packages collection, then we recommend either a CD\n"
"distribution or the master distribution on ftp.freebsd.org.");
msgConfirm("Unable to get packages/INDEX file from selected media.\n\n"
"This may be because the packages collection is not available\n"
"on the distribution media you've chosen, most likely an FTP site\n"
"without the packages collection mirrored. Please verify that\n"
"your media, or your path to the media, is correct and try again.");
mediaDevice->shutdown(mediaDevice);
restorescr(w);
return DITEM_FAILURE;

View File

@ -603,7 +603,7 @@ installStandard(dialogMenuItem *self)
#endif
dialog_clear_norefresh();
if (!msgNoYes("Does this system have a USB mouse attached to it?"))
if (msgNoYes("Does this system have a USB mouse attached to it?"))
dmenuOpenSimple(&MenuMouse, FALSE);
/* Now would be a good time to checkpoint the configuration data */