diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2012-03-24 10:45:48 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2012-03-24 10:45:48 -0500 |
commit | 5cd6238df496a3cea178e4596ecd87967cce1ce6 (patch) | |
tree | 14b14d43902060dd767a4b3966f8b9d5ed98a7ab /src/lib/Server/Plugins | |
parent | 94ea8d8266175509ddb2bc4cf48c273d948da766 (diff) | |
parent | f65546ba6b13590515a6ea1e20b883454f3d1e1d (diff) | |
download | bcfg2-5cd6238df496a3cea178e4596ecd87967cce1ce6.tar.gz bcfg2-5cd6238df496a3cea178e4596ecd87967cce1ce6.tar.bz2 bcfg2-5cd6238df496a3cea178e4596ecd87967cce1ce6.zip |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Server/Plugins')
-rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 917f27e20..c3e807d7a 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -102,7 +102,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): def debug_log(self, message, flag=None): if (flag is None and self.debug_flag) or flag: - self.logger.error(message) + logger.error(message) def sort_by_specific(self, one, other): return cmp(one.specific, other.specific) @@ -227,15 +227,15 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): if 'text' in new_entry: name = self.build_filename(specific) if os.path.exists("%s.genshi" % name): - self.logger.error("Cfg: Unable to pull data for genshi types") + logger.error("Cfg: Unable to pull data for genshi types") raise Bcfg2.Server.Plugin.PluginExecutionError elif os.path.exists("%s.cheetah" % name): - self.logger.error("Cfg: Unable to pull data for cheetah types") + logger.error("Cfg: Unable to pull data for cheetah types") raise Bcfg2.Server.Plugin.PluginExecutionError try: etext = new_entry['text'].encode(self.encoding) except: - self.logger.error("Cfg: Cannot encode content of %s as %s" % (name, self.encoding)) + logger.error("Cfg: Cannot encode content of %s as %s" % (name, self.encoding)) raise Bcfg2.Server.Plugin.PluginExecutionError open(name, 'w').write(etext) self.debug_log("Wrote file %s" % name, flag=log) @@ -244,11 +244,11 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): if badattr: # check for info files and inform user of their removal if os.path.exists(self.path + "/:info"): - self.logger.info("Removing :info file and replacing with " + logger.info("Removing :info file and replacing with " "info.xml") os.remove(self.path + "/:info") if os.path.exists(self.path + "/info"): - self.logger.info("Removing info file and replacing with " + logger.info("Removing info file and replacing with " "info.xml") os.remove(self.path + "/info") metadata_updates = {} |