From a24ab61eabe24656b457273f54133fa99087f2f6 Mon Sep 17 00:00:00 2001 From: Farenjihn Date: Fri, 17 Aug 2018 11:58:55 +0200 Subject: [PATCH] firewall/core/fw_nm: nm_get_zone_of_connection should return None or empty string instead of False (cherry picked from commit 5a59a90f449a8bf836e62e2d9ad486301b1aa2bb) --- src/firewall/core/fw_nm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/firewall/core/fw_nm.py b/src/firewall/core/fw_nm.py index 97113d95..37282a1a 100644 --- a/src/firewall/core/fw_nm.py +++ b/src/firewall/core/fw_nm.py @@ -75,21 +75,21 @@ def nm_get_zone_of_connection(connection): con = nm_get_client().get_connection_by_uuid(connection) if con is None: - return False + return None setting_con = con.get_setting_connection() if setting_con is None: - return False + return None try: if con.get_flags() & (NM.SettingsConnectionFlags.NM_GENERATED | NM.SettingsConnectionFlags.NM_VOLATILE): - return False + return "" except AttributeError: # Prior to NetworkManager 1.12, we can only guess # that a connection was generated/volatile. if con.get_unsaved(): - return False + return "" zone = setting_con.get_zone() if zone is None: -- 2.18.0