File 0001-src-firewall-config-Fix-default-value-for-... of Package firewalld

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-src-firewall-config-Fix-default-value-for-dialog-but.patch of Package firewalld (Revision c91a19a7bab4ee3f45781bb7e7db6641)

Currently displaying revision c91a19a7bab4ee3f45781bb7e7db6641 , Show latest

From e776eec09dcf657fe3d8448a961416d13beb643e Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 27 Feb 2018 19:05:43 +0000
Subject: [PATCH 1/2] src: firewall-config: Fix default value for dialog
 buttons

The default value of the buttons argument did not work as expected. A
nested tuple with a single item is automatically converted to a regular
tuple and the length() of that tuple was actually the number of items of
that tuple. As a result of which, creating a dialog with a single button
resulted to the following error:

Traceback (most recent call last):
  File "./src/firewall-config", line 1623, in connection_failed
    message_type=Gtk.MessageType.ERROR, msg=msg) == 1:
  File "./src/firewall-config", line 1596, in _dialog
    for button,id in buttons:
ValueError: too many values to unpack

The way to solve that, is to convert the nested tuple to a list of
tuples instead.
---
 src/firewall-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/firewall-config b/src/firewall-config
index a072f55f..4ce58b4e 100755
--- a/src/firewall-config
+++ b/src/firewall-config
@@ -1580,7 +1580,7 @@ class FirewallConfig(object):
 
     def _dialog(self, text, msg=None, title=None,
                 message_type=Gtk.MessageType.INFO,
-                buttons=("gtk-close", 1)):
+                buttons=[("gtk-close", 1)]):
         dialog = Gtk.MessageDialog(parent=None, flags=0,
                                    message_type=message_type)
         dialog.set_markup(text)
-- 
2.16.2

Places

File 0001-src-firewall-config-Fix-default-value-for-dialog-but.patch of Package firewalld (Revision c91a19a7bab4ee3f45781bb7e7db6641)

Places