From e9714f3de2d81793a1b7504fbbd86e4c6477ee79 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 23 Mar 2012 11:16:27 -0500 Subject: schemas: Add device attributes for BoundPath entries Signed-off-by: Sol Jerome --- schemas/pathentry.xsd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/schemas/pathentry.xsd b/schemas/pathentry.xsd index 40aa4ff2b..315b0082e 100644 --- a/schemas/pathentry.xsd +++ b/schemas/pathentry.xsd @@ -30,6 +30,12 @@ + + + + + + -- cgit v1.2.3-1-g7c22 From 32cf8f8268a20fe7f8257964128927305a3c9ffe Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 23 Mar 2012 12:34:51 -0500 Subject: Cfg: Fix logger calls Signed-off-by: Sol Jerome --- src/lib/Server/Plugins/Cfg.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index fafc6c638..ed08d454d 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -103,7 +103,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) @@ -228,15 +228,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) @@ -245,11 +245,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 = {} -- cgit v1.2.3-1-g7c22 From f65546ba6b13590515a6ea1e20b883454f3d1e1d Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 24 Mar 2012 10:37:46 -0500 Subject: Fix build errors We only need M2Crypto when using python 2.5 or less. Other versions include python ssl. Signed-off-by: Sol Jerome --- setup.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index ece7b4a24..69c67c0b1 100755 --- a/setup.py +++ b/setup.py @@ -8,6 +8,12 @@ import os import os.path import sys +# we only need m2crypto on < python2.6 +need_m2crypto = False +version = sys.version_info[:2] +if version < (2, 6): + need_m2crypto = True + class BuildDTDDoc (Command): """Build DTD documentation""" @@ -119,6 +125,10 @@ py3lib = 'src/lib/Bcfg2Py3Incompat.py' if sys.hexversion < 0x03000000 and os.path.exists(py3lib): os.remove(py3lib) +inst_reqs = ["lxml"] +if need_m2crypto: + inst_reqs.append("M2Crypto") + setup(cmdclass=cmdclass, name="Bcfg2", version="1.2.2", @@ -140,9 +150,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Reports.reports.templatetags", "Bcfg2.Server.Snapshots", ], - install_requires = ["lxml", - "M2Crypto", - ], + install_requires = inst_reqs, package_dir = {'Bcfg2': 'src/lib'}, package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22