From ab141993cb9ff997b41dba1fc4575ba0e94b9cdf Mon Sep 17 00:00:00 2001 From: Duncan Hutty Date: Mon, 12 Aug 2013 11:44:51 -0400 Subject: sort the lists of Groups and Bundles in the output of bcfg2-info showclient --- src/lib/Bcfg2/Server/Info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Info.py') diff --git a/src/lib/Bcfg2/Server/Info.py b/src/lib/Bcfg2/Server/Info.py index 649ab2bb7..d6fd3f723 100644 --- a/src/lib/Bcfg2/Server/Info.py +++ b/src/lib/Bcfg2/Server/Info.py @@ -550,7 +550,7 @@ class Showclient(InfoCmd): group_fmt = "%-10s %-30s %s" header = False - for group in list(metadata.groups): + for group in sorted(list(metadata.groups)): category = "" for cat, grp in metadata.categories.items(): if grp == group: @@ -564,7 +564,7 @@ class Showclient(InfoCmd): if metadata.bundles: print(fmt % ("Bundles:", list(metadata.bundles)[0])) - for bnd in list(metadata.bundles)[1:]: + for bnd in sorted(list(metadata.bundles)[1:]): print(fmt % ("", bnd)) if metadata.connectors: print("Connector data") -- cgit v1.2.3-1-g7c22 From 98e930a5521c01e5d364bc5edd375446ed5a9835 Mon Sep 17 00:00:00 2001 From: Duncan Hutty Date: Mon, 12 Aug 2013 12:51:47 -0400 Subject: ensure that bundles list correctly for clients with 1/many bundles --- src/lib/Bcfg2/Server/Info.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2/Server/Info.py') diff --git a/src/lib/Bcfg2/Server/Info.py b/src/lib/Bcfg2/Server/Info.py index d6fd3f723..64621aa53 100644 --- a/src/lib/Bcfg2/Server/Info.py +++ b/src/lib/Bcfg2/Server/Info.py @@ -563,9 +563,10 @@ class Showclient(InfoCmd): print(group_fmt % ("", group, category)) if metadata.bundles: - print(fmt % ("Bundles:", list(metadata.bundles)[0])) - for bnd in sorted(list(metadata.bundles)[1:]): - print(fmt % ("", bnd)) + sorted_bundles = sorted(list(metadata.bundles)) + print(fmt % ("Bundles:", sorted_bundles[0])) + for bnd in sorted_bundles[1:]: + print(fmt % ("", bnd)) if metadata.connectors: print("Connector data") print("=" * 80) -- cgit v1.2.3-1-g7c22