[initial-setup][rhel7-branch][PATCH] Fix register_event_cb function signature (#1072033)

[Martin Kolman]

The function signature on the anaconda side changed due to the
Help patch set, so we need to also change the signature in Initial Setup
to avoid a traceback due to incompatible number of arguments.

Related: rhbz#1072033
Signed-off-by: Martin Kolman 
---
 initial_setup/gui/hubs/initial_setup_hub.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/initial_setup/gui/hubs/initial_setup_hub.py b/initial_setup/gui/hubs/initial_setup_hub.py
index e9ea54e..24b9edd 100644
--- a/initial_setup/gui/hubs/initial_setup_hub.py
+++ b/initial_setup/gui/hubs/initial_setup_hub.py
@@ -76,11 +76,13 @@ class InitialSetupMainHub(Hub):
     def quitButton(self):
         return self.builder.get_object("quitButton")

-    def register_event_cb(self, event, cb):
+    def register_event_cb(self, event, cb, *args):
         if event == "continue" and self.continueButton:
             self.continueButton.connect("clicked", lambda *args: cb())
         elif event == "quit" and self.quitButton:
             self.quitButton.connect("clicked", lambda *args: self._on_quit_clicked(cb))
+        elif event == "help-button":
+            self.window.connect("help-button-clicked", cb, *args)

def _on_quit_clicked(self, cb):
         try:

[Brian C. Lane]

On Wed, Oct 01, 2014 at 05:57:41PM +0200, Martin Kolman wrote:
> The function signature on the anaconda side changed due to the
> Help patch set, so we need to also change the signature in Initial Setup
> to avoid a traceback due to incompatible number of arguments.
>
> Related: rhbz#1072033
> Signed-off-by: Martin Kolman
>
> initial_setup/gui/hubs/initial_setup_hub.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/initial_setup/gui/hubs/initial_setup_hub.py b/initial_setup/gui/hubs/initial_setup_hub.py
> index e9ea54e..24b9edd 100644
> --- a/initial_setup/gui/hubs/initial_setup_hub.py
> +++ b/initial_setup/gui/hubs/initial_setup_hub.py
> @@ -76,11 +76,13 @@ class InitialSetupMainHub(Hub):
>      def quitButton(self):
>          return self.builder.get_object("quitButton")
> def register_event_cb(self, event, cb):
>
> def register_event_cb(self, event, cb, *args):
>     if event == "continue" and self.continueButton:
>         self.continueButton.connect("clicked", lambda *args: cb())
>     elif event == "quit" and self.quitButton:
>         self.quitButton.connect("clicked", lambda *args: self._on_quit_clicked(cb))
>    elif event == "help-button":
>        self.window.connect("help-button-clicked", cb, *args)
>
> def _on_quit_clicked(self, cb):
>        try:
>
> -- 
> 1.9.3

Ack