diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2005-12-07 00:12:31 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2005-12-07 00:12:31 +0000 |
commit | 2769d83e0b648d1d623b4a1648973d6c32945b13 (patch) | |
tree | 369f7e55fa0640939bad76998807dede33785fa2 /src/lib/Server/Metadata.py | |
parent | ca9bc79f042ad01bcd6ced351e4dd7aef5196376 (diff) | |
download | bcfg2-2769d83e0b648d1d623b4a1648973d6c32945b13.tar.gz bcfg2-2769d83e0b648d1d623b4a1648973d6c32945b13.tar.bz2 bcfg2-2769d83e0b648d1d623b4a1648973d6c32945b13.zip |
Fix error reporting for parse failures
Fix comment printing for etc/metadata.xml
Add a better error message for client communication bootstrapping failures
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1615 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Metadata.py')
-rw-r--r-- | src/lib/Server/Metadata.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Server/Metadata.py b/src/lib/Server/Metadata.py index 957179751..47bbb3ecb 100644 --- a/src/lib/Server/Metadata.py +++ b/src/lib/Server/Metadata.py @@ -1,7 +1,7 @@ '''This file stores persistent metadata for the BCFG Configuration Repository''' __revision__ = '$Revision$' -from lxml.etree import XML, SubElement, Element +from lxml.etree import XML, SubElement, Element, _Comment, tostring from syslog import syslog, LOG_ERR, LOG_INFO from Bcfg2.Server.Plugin import SingleXMLFileBacked @@ -106,6 +106,8 @@ class MetadataStore(SingleXMLFileBacked): def pretty_print(self, element, level=0): '''Produce a pretty-printed text representation of element''' + if isinstance(element, _Comment): + return (level * " ") + tostring(element) if element.text: fmt = "%s<%%s %%s>%%s</%%s>" % (level*" ") data = (element.tag, (" ".join(["%s='%s'" % (key, element.attrib[key]) for key in element.attrib])), |