diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-11 18:05:56 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-12 14:13:42 +0100 |
| commit | 4e37fdf5adbf4d25561b472b4089b6782c599f93 (patch) | |
| tree | 82182fee7bd6f56a91b392c12dfb5cede7b4455b /morphlib/plugins/branch_and_merge_plugin.py | |
| parent | 6b63ab3036e869c92b3c5d6471e4856df3583019 (diff) | |
| download | morph-4e37fdf5adbf4d25561b472b4089b6782c599f93.tar.gz | |
Don't require .morph in triplet arguments
This gives us consistency with morphologies, where the triplets are
repo|ref|morphology, not repo|ref|filename
Anyone who runs 'morph build baserock:morphs master system.morph' will
now see an error ending with 'was looking for system.morph.morph', which
should make it clear where they have gone wrong.
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index d6485c2b..2ab18869 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -320,7 +320,8 @@ class BranchAndMergePlugin(cliapp.Plugin): app = self.app cache = morphlib.util.new_repo_caches(app)[0] - for filename in args: + for morphology_name in args: + filename = morphology_name + '.morph' with open(filename) as f: morph = morphlib.morph2.Morphology(f.read()) @@ -708,7 +709,7 @@ class BranchAndMergePlugin(cliapp.Plugin): build_command) build_command.build([branch_root, build_repos[branch_root]['build-ref'], - '%s.morph' % system_name]) + system_name]) # Delete the temporary refs on the server. self.delete_remote_build_refs(build_repos) |