diff options
author | Chris Lumens <clumens@redhat.com> | 2012-07-12 14:53:42 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2012-07-12 14:53:42 -0400 |
commit | 070f8501931807d3c2803d1c7579f64c88ced632 (patch) | |
tree | f6d34aaff55b8a9671720d7d623f830324c95a84 /pyanaconda | |
parent | 8ee5cbf54946e880c77a3d6d7f7004343dfc8aa0 (diff) | |
download | anaconda-070f8501931807d3c2803d1c7579f64c88ced632.tar.gz anaconda-070f8501931807d3c2803d1c7579f64c88ced632.tar.xz anaconda-070f8501931807d3c2803d1c7579f64c88ced632.zip |
Fix auto-continuing for kickstart installs.
If you're on a spoke when all other spokes become ready and complete, the
install will continue automatically when you hit back. If you're on the hub,
the install will continue automatically when all spokes are ready and
complete.
It's a little jarring, but that's just how it's gotta be.
Diffstat (limited to 'pyanaconda')
-rw-r--r-- | pyanaconda/ui/gui/hubs/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index b2de91a79..0539dc09a 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -78,6 +78,7 @@ class Hub(UIObject): self._autoContinue = False self._incompleteSpokes = [] + self._inSpoke = False self._notReadySpokes = [] self._spokes = {} @@ -271,8 +272,11 @@ class Hub(UIObject): if not args[1]: spoke.execute() - if len(self._incompleteSpokes) == 0: - self._autoContinue = True + if len(self._incompleteSpokes) == 0 and len(self._notReadySpokes) == 0: + if self._inSpoke: + self._autoContinue = True + else: + self.continueButton.emit("clicked") elif code == communication.HUB_CODE_MESSAGE: spoke.selector.set_property("status", args[1]) @@ -309,7 +313,9 @@ class Hub(UIObject): if selector: selector.grab_focus() + self._inSpoke = True self._runSpoke(spoke) + self._inSpoke = False # Now update the selector with the current status and completeness. if not spoke.indirect: |