summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2001-07-22 20:42:42 +0000
committerJeremy Katz <katzj@redhat.com>2001-07-22 20:42:42 +0000
commit84ade8c75a860ca58493a6d1cdbf3909e36406b3 (patch)
tree3216df83d47a0faa0c1f61f0261ad4d5a5581223 /anaconda
parentff1cd7ed3ff1de11bf7fde9f9bdb31dfab394354 (diff)
downloadanaconda-84ade8c75a860ca58493a6d1cdbf3909e36406b3.tar.gz
anaconda-84ade8c75a860ca58493a6d1cdbf3909e36406b3.tar.xz
anaconda-84ade8c75a860ca58493a6d1cdbf3909e36406b3.zip
if they've asked for text mode, there's no need to warn them that we're using it. fixes the other half of 49637
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda5
1 files changed, 3 insertions, 2 deletions
diff --git a/anaconda b/anaconda
index ee3f75053..1e996c882 100755
--- a/anaconda
+++ b/anaconda
@@ -398,7 +398,8 @@ if (progmode == 'reconfig'):
else:
display_mode = 't'
-if (method and ((len (method) >= 6 and method[:6] == "ftp://")
+if (display_mode != 't' and method and
+ ((len (method) >= 6 and method[:6] == "ftp://")
or (len (method) >= 7 and method[:7] == "http://")
or (len (method) >= 5 and method[:5] == "hd://"))):
print _("Graphical installation not available for %s installs. "
@@ -408,7 +409,7 @@ if (method and ((len (method) >= 6 and method[:6] == "ftp://")
# if no mouse we force text mode
mousedev = mousehw.get()
-if mousedev[0] == "None - None":
+if display_mode != 't' and mousedev[0] == "None - None":
print _("No mouse was detected. A mouse is required for graphical "
"installation. Starting text mode.")
display_mode = 't'