[master/rhel7-branch] Don't mark spoke as completed if no repo is set. (#1001538)

Samantha N. Bueno sbueno+anaconda at redhat.com
Tue Sep 3 19:41:19 UTC 2013


Even though the status text notifies users there is a problem
setting up the install repo, the spoke should not be getting
detected as 'complete'.

In the GUI, this now marks the spoke with the error icon so it's
more visibly obvious to users the spoke needs attention.

In the TUI, the '!' (for 'not complete') is shown next to the spoke
instead of 'x' ('complete').

Resolves: rhbz#1001538
---
 pyanaconda/ui/gui/spokes/source.py | 2 +-
 pyanaconda/ui/tui/spokes/source.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index e49f163..e6489ef 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -463,7 +463,7 @@ class SourceSpoke(NormalSpoke):
         if flags.automatedInstall and (not self.data.method.method or not self.payload.baseRepo):
             return False
         else:
-            return not self._error and self.status and self.status != _("Nothing selected")
+            return not self._error and self.status and (self.data.method.method or self.payload.baseRepo)
 
     @property
     def mandatory(self):
diff --git a/pyanaconda/ui/tui/spokes/source.py b/pyanaconda/ui/tui/spokes/source.py
index 020e392..566edf0 100644
--- a/pyanaconda/ui/tui/spokes/source.py
+++ b/pyanaconda/ui/tui/spokes/source.py
@@ -112,7 +112,7 @@ class SourceSpoke(EditTUISpoke):
         if flags.automatedInstall and (not self.data.method.method or not self.payload.baseRepo):
             return False
         else:
-            return not self.errors and self.ready
+            return not self.errors and self.ready and (self.data.method.method or self.payload.baseRepo)
 
     def refresh(self, args=None):
         EditTUISpoke.refresh(self, args)
-- 
1.7.11.7



More information about the anaconda-patches mailing list