From e1ee5840b7e3bb034894fb3a3450dbeaa655b73f Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 18 Oct 2012 12:02:38 +0100 Subject: morph status: Sort list of system branches in a workspace Output needs to be stable, not least so that the test doesn't fail sporadically. --- morphlib/plugins/branch_and_merge_plugin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'morphlib/plugins') diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 384f0550..6d5f3b7c 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1324,8 +1324,9 @@ class BranchAndMergePlugin(cliapp.Plugin): if branch is None: self.app.output.write("System branches in current workspace:\n") - for dirname in self.walk_special_directories( - workspace, special_subdir='.morph-system-branch'): + branch_dirs = sorted(self.walk_special_directories( + workspace, special_subdir='.morph-system-branch')) + for dirname in branch_dirs: branch = self.get_branch_config(dirname, 'branch.name') self.app.output.write(" %s\n" % branch) return -- cgit v1.2.1