From 2568411e70eec2c1ea851b8260f250ce6339a268 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 1 Dec 2005 17:29:12 +0000 Subject: Fix lxml breakage in Account.py and GenerateHostInfo Fix debian bug in server init script git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1599 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/GenerateHostInfo | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/sbin/GenerateHostInfo') diff --git a/src/sbin/GenerateHostInfo b/src/sbin/GenerateHostInfo index 1993ddb19..f8f33db08 100644 --- a/src/sbin/GenerateHostInfo +++ b/src/sbin/GenerateHostInfo @@ -16,13 +16,14 @@ def pretty_print(element, level=0): fmt = "%s<%%s %%s>%%s" % (level*" ") data = (element.tag, (" ".join(["%s='%s'" % keyval for keyval in element.attrib.iteritems()])), element.text, element.tag) - if element._children: - fmt = "%s<%%s %%s>\n" % (level*" ",) + (len(element._children) * "%s") + "%s\n" % (level*" ") - data = (element.tag, ) + (" ".join(["%s='%s'" % keyval for keyval in element.attrib.iteritems()]),) - data += tuple([pretty_print(entry, level+2) for entry in element._children]) + (element.tag, ) + children = element.getchildren() + if children: + fmt = "%s<%%s %%s>\n" % (level*" ",) + (len(children) * "%s") + "%s\n" % (level*" ") + data = (element.tag, ) + (" ".join(["%s='%s'" % (key, element.attrib[key]) for key in element.attrib]),) + data += tuple([pretty_print(entry, level+2) for entry in children]) + (element.tag, ) else: fmt = "%s<%%s %%s/>\n" % (level * " ") - data = (element.tag, " ".join(["%s='%s'" % keyval for keyval in element.attrib.iteritems()])) + data = (element.tag, " ".join(["%s='%s'" % (key, element.attrib[key]) for key in element.attrib])) return fmt % data -- cgit v1.2.3-1-g7c22