summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-09-06 09:07:06 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-09-06 09:07:06 -0500
commit1f794e11c68fe1b6eb6e40fdf0aa599ba759050a (patch)
tree9d7b9c48940d3dd04e96a620f8c9601b2155b669 /src
parent8ebb16fed2e768243a98d5333f9316e570870ce3 (diff)
parent98e930a5521c01e5d364bc5edd375446ed5a9835 (diff)
downloadbcfg2-1f794e11c68fe1b6eb6e40fdf0aa599ba759050a.tar.gz
bcfg2-1f794e11c68fe1b6eb6e40fdf0aa599ba759050a.tar.bz2
bcfg2-1f794e11c68fe1b6eb6e40fdf0aa599ba759050a.zip
Merge branch 'sort-bcfg2-info-lists' of https://github.com/dhutty/bcfg2
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Info.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Info.py b/src/lib/Bcfg2/Server/Info.py
index fb849f0c6..3a1ed7433 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:
@@ -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 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)