From d61ba8bae2c060ea36f2bdeece81a3935b932999 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 6 Apr 2009 13:11:48 +0200 Subject: [PATCH] entropy.client.interfaces.methods.Misc: update backup_setting to work with SystemSettings too --- .../entropy/client/interfaces/methods.py | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libraries/entropy/client/interfaces/methods.py b/libraries/entropy/client/interfaces/methods.py index 0f09987f5..423c22c91 100644 --- a/libraries/entropy/client/interfaces/methods.py +++ b/libraries/entropy/client/interfaces/methods.py @@ -860,15 +860,19 @@ class Misc: return False # yay! def backup_setting(self, setting_name): - if etpConst.has_key(setting_name): - myinst = etpConst[setting_name] - if type(etpConst[setting_name]) in (list,tuple): - myinst = etpConst[setting_name][:] - elif type(etpConst[setting_name]) in (dict,set): - myinst = etpConst[setting_name].copy() + var = etpConst + if self.SystemSettings.has_key(setting_name): + var = self.SystemSettings + + if var.has_key(setting_name): + myinst = var[setting_name] + if type(var[setting_name]) in (list,tuple): + myinst = var[setting_name][:] + elif type(var[setting_name]) in (dict,set): + myinst = var[setting_name].copy() else: - myinst = etpConst[setting_name] - etpConst['backed_up'].update({setting_name: myinst}) + myinst = var[setting_name] + var['backed_up'].update({setting_name: myinst}) else: t = _("Nothing to backup in etpConst with %s key") % (setting_name,) raise InvalidData("InvalidData: %s" % (t,))