From 8d48dfee165ad41ed2d235dc3772c5b588a75521 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Mon, 4 May 2020 10:48:10 -0400 Subject: [PATCH 20/45] fix(dbus): service: don't cleanup config for old set APIs This avoids them from unknowingly wiping away config that the old APIs are unaware of. Fixes: 335a68c1bba5 ("fix: dbus: fix service API break") (cherry picked from commit 11bd8742158b2b3c9b0412a9ca1cb9ada7fd6fd7) (cherry picked from commit faa5822d8073336bed29e12b7cc73bedfa4811b7) --- src/firewall/core/fw_config.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/firewall/core/fw_config.py b/src/firewall/core/fw_config.py index 8f29f0c416d2..35f623f2c8f1 100644 --- a/src/firewall/core/fw_config.py +++ b/src/firewall/core/fw_config.py @@ -566,7 +566,6 @@ class FirewallConfig(object): if obj.builtin: x = copy.copy(obj) - x.cleanup() x.import_config(conf_dict) x.path = config.ETC_FIREWALLD_SERVICES x.builtin = False @@ -576,7 +575,6 @@ class FirewallConfig(object): service_writer(x) return x else: - obj.cleanup() obj.import_config(conf_dict) service_writer(obj) return obj -- 2.27.0