[master/f20/rhel7] Send the continue click after the queue is empty (#1025346)

Brian C. Lane bcl at redhat.com
Thu Oct 31 14:19:23 UTC 2013


From: "Brian C. Lane" <bcl at redhat.com>

Previously, if the queue was not empty, the click would not be sent and
kickstarts would sometimes not continue automatically.

Resolves: rhbz#1025346
---
 pyanaconda/ui/gui/hubs/__init__.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py
index e52d87e..e2efb09 100644
--- a/pyanaconda/ui/gui/hubs/__init__.py
+++ b/pyanaconda/ui/gui/hubs/__init__.py
@@ -303,6 +303,7 @@ class Hub(GUIObject, common.Hub):
             # no spokes, move on
             gtk_call_once(self.continueButton.emit, "clicked")
 
+        click_continue = False
         # Grab all messages that may have appeared since last time this method ran.
         while True:
             try:
@@ -350,15 +351,21 @@ class Hub(GUIObject, common.Hub):
                     if self.continuePossible:
                         if self._inSpoke:
                             self._autoContinue = False
-                        elif self._autoContinue and q.empty():
-                            # enqueue the emit to the Gtk message queue
-                            gtk_call_once(self.continueButton.emit, "clicked")
+                        elif self._autoContinue:
+                            click_continue = True
+
             elif code == hubQ.HUB_CODE_MESSAGE:
                 spoke.selector.set_property("status", args[1])
                 log.info("setting %s status to: %s" % (spoke, args[1]))
 
             q.task_done()
 
+        # queue is now empty, should continue be clicked?
+        if self._autoContinue and click_continue:
+            # enqueue the emit to the Gtk message queue
+            log.info("_autoContinue clicking continue button")
+            gtk_call_once(self.continueButton.emit, "clicked")
+
         return True
 
     def refresh(self):
-- 
1.8.3.1



More information about the anaconda-patches mailing list