From: Marc Fiuczynski Date: Wed, 7 May 2008 21:25:36 +0000 (+0000) Subject: fix bug with conf_file variable in the nodegroup and node conf file update X-Git-Tag: PLCAPI-4.2-6~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=44e68d6959f6ecd4dece43e51da98413cdf45ed4;p=plcapi.git fix bug with conf_file variable in the nodegroup and node conf file update --- diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py index d3c5471..e23e5fc 100644 --- a/PLC/Methods/GetSlivers.py +++ b/PLC/Methods/GetSlivers.py @@ -189,14 +189,15 @@ class GetSlivers(Method): for nodegroup in nodegroups.values(): for conf_file_id in nodegroup['conf_file_ids']: if conf_file_id in all_conf_files: - conf_files[conf_file['dest']] = all_conf_files[conf_file_id] + conf_file = all_conf_files[conf_file_id] + conf_files[conf_file['dest']] = conf_file # Node configuration files take precedence over node group # configuration files. for conf_file_id in node['conf_file_ids']: if conf_file_id in all_conf_files: - conf_files[conf_file['dest']] = all_conf_files[conf_file_id] - + conf_file = all_conf_files[conf_file_id] + conf_files[conf_file['dest']] = conf_file # Get all (enabled) initscripts initscripts = InitScripts(self.api, {'enabled': True})