diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-03 17:31:50 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-03 17:31:50 +0000 |
| commit | 530ffb7125f87e528dcf6338b637ef71a7930b8c (patch) | |
| tree | dee90466f818dcd8b683f31c7a2ed3fd181df31a | |
| parent | 4c7b6184fe12775ceb83cefb405921e961495e9c (diff) | |
| parent | 7767391ba4e21d3e0f934484d7a953e623ba5902 (diff) | |
| download | morph-530ffb7125f87e528dcf6338b637ef71a7930b8c.tar.gz | |
Merge remote-tracking branch 'origin/samthursfield/stable-glob'
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index bba0afe4..30f66ff1 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -810,7 +810,7 @@ class BranchAndMergePlugin(cliapp.Plugin): root_repo = self.get_branch_config(branch_path, 'branch.root') root_repo_dir = self.find_repository(branch_path, root_repo) - 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': @@ -1296,7 +1296,7 @@ class BranchAndMergePlugin(cliapp.Plugin): from_branch_dir, root_repo, from_branch, to_branch_dir, root_repo, to_branch) - for f in glob.glob(os.path.join(to_root_dir, '*.morph')): + for f in sorted(glob.iglob(os.path.join(to_root_dir, '*.morph'))): name = os.path.basename(f)[:-len('.morph')] merge_system(name) |