diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-05 17:09:27 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-05 17:09:34 +0000 |
| commit | 3853f1986ca04deee5d470f9f5f181556bcd29ed (patch) | |
| tree | cfd89cf8b7a44e8378a923ea910c64171788a439 | |
| parent | 163f9dc6e5424122ee218c4ef6009274831210ca (diff) | |
| parent | a2b8f6722c7e784ba009d34bf1af62d047e2f928 (diff) | |
| download | definitions-3853f1986ca04deee5d470f9f5f181556bcd29ed.tar.gz | |
Merge branch 'samthursfield/stable-merge'
Reviewed-By: Lars Wirzenius (on IRC)
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index f0cbea81..332cdfe9 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -739,7 +739,7 @@ class BranchAndMergePlugin(cliapp.Plugin): # We must first get the full set of strata. One same stratum may be # in multiple systems and each system may use a different ref. strata = {} - for f in glob.glob(os.path.join(root_repo_dir, '*.morph')): + for f in sorted(glob.iglob(os.path.join(root_repo_dir, '*.morph'))): name = os.path.basename(f)[:-len('.morph')] morphology = self.load_morphology(root_repo_dir, name) if morphology['kind'] != 'system': |