[PATCH] Fix text-mode issue with begin installation. (#975793)
Samantha N. Bueno
sbueno+anaconda at redhat.com
Wed Feb 26 16:35:12 UTC 2014
This is a revert of 180545b0, which completely prevents users from
beginning installation.
Related: rhbz#975793
---
pyanaconda/ui/tui/hubs/__init__.py | 7 +------
pyanaconda/ui/tui/hubs/summary.py | 5 +----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/pyanaconda/ui/tui/hubs/__init__.py b/pyanaconda/ui/tui/hubs/__init__.py
index e4d5627..9269a0c 100644
--- a/pyanaconda/ui/tui/hubs/__init__.py
+++ b/pyanaconda/ui/tui/hubs/__init__.py
@@ -108,15 +108,10 @@ class TUIHub(TUIObject, common.Hub):
except (ValueError, KeyError):
# If we get a continue, check for unfinished spokes. If unfinished
# don't continue
- # TRANSLATORS: 'b' to begin installation
- if key.lower() == _('b'):
+ if key == _('c'):
for spoke in self._spokes.values():
if not spoke.completed and spoke.mandatory:
print(_("Please complete all spokes before continuing"))
return False
- # Kind of a hack, but we want to ignore if anyone presses 'c'
- # which is the global TUI key to close the current screen
- elif key.lower() == _('c'):
- return False
log.debug("returning True")
return True
diff --git a/pyanaconda/ui/tui/hubs/summary.py b/pyanaconda/ui/tui/hubs/summary.py
index b8479af..0080031 100644
--- a/pyanaconda/ui/tui/hubs/summary.py
+++ b/pyanaconda/ui/tui/hubs/summary.py
@@ -73,7 +73,4 @@ class SummaryHub(TUIHub):
# does not automatically proceed once all spokes are complete, and a
# user must confirm they want to begin installation
flags.automatedInstall = False
-
- # override the default prompt since we want to offer the 'b' to begin
- # installation option here
- return _(u" Please make your choice from above ['q' to quit | 'b' to begin installation |\n 'r' to refresh]: ")
+ return TUIHub.prompt(self, args)
--
1.8.3.1
More information about the anaconda-patches
mailing list