From bb16ce00cbca613129a3bb34ad3fc945f409a4d4 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 18 Jan 2012 16:33:56 -0500 Subject: Move sorting to the server core, rather than just in bcfg2 info --- src/sbin/bcfg2-info | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 7c655ebe0..31b9ba0c6 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -104,13 +104,6 @@ def displayTrace(trace, num=80, sort=('time', 'calls')): stats.sort_stats('cumulative', 'calls', 'time') stats.print_stats(200) -def sort_xml(node, key=None): - for child in node: - sort_xml(child, key) - - sorted_children = sorted(node, key=key) - node[:] = sorted_children - class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core): """Main class for bcfg2-info.""" def __init__(self, repo, plgs, passwd, encoding, event_debug, filemonitor='default'): @@ -214,9 +207,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core): if not ofile.startswith('/tmp') and not path_force: print("Refusing to write files outside of /tmp without -f option") return - client_config = self.BuildConfiguration(client) - sort_xml(client_config, key=lambda e: e.get('name')) - lxml.etree.ElementTree(client_config).write(ofile, + lxml.etree.ElementTree(self.BuildConfiguration(client)).write(ofile, encoding='UTF-8', xml_declaration=True, pretty_print=True) else: -- cgit v1.2.3-1-g7c22