From 2769d83e0b648d1d623b4a1648973d6c32945b13 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 7 Dec 2005 00:12:31 +0000 Subject: 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 --- src/lib/Server/Metadata.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Metadata.py') 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" % (level*" ") data = (element.tag, (" ".join(["%s='%s'" % (key, element.attrib[key]) for key in element.attrib])), -- cgit v1.2.3-1-g7c22