diff options
| author | Ben Brown <ben.brown@codethink.co.uk> | 2013-12-13 14:05:57 +0000 |
|---|---|---|
| committer | Ben Brown <ben.brown@codethink.co.uk> | 2013-12-16 15:25:15 +0000 |
| commit | 53495e0a507a78e120d4589b52a59b5123c2ecfd (patch) | |
| tree | a370e906caf48cf0ae8721c98b8b959376511c9d /morphlib/plugins | |
| parent | a127ae932b5941f4376f019e5983fcfadfcc068b (diff) | |
| download | morph-53495e0a507a78e120d4589b52a59b5123c2ecfd.tar.gz | |
Modify morph to strip .morph extensions from parameters
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 8 | ||||
| -rw-r--r-- | morphlib/plugins/build_plugin.py | 2 | ||||
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 3a3c1d1b..f3b47468 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -417,9 +417,11 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): ' a stratum and optionally a chunk' ' as parameters') - system_name = args[0] - stratum_name = args[1] - chunk_name = args[2] if len(args) == 3 else None + system_name = morphlib.util.strip_morph_extension(args[0]) + stratum_name = morphlib.util.strip_morph_extension(args[1]) + chunk_name = None + if len(args) == 3: + chunk_name = morphlib.util.strip_morph_extension(args[2]) ws = morphlib.workspace.open('.') sb = morphlib.sysbranchdir.open_from_within('.') diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py index 8e04d0b3..a58bce20 100644 --- a/morphlib/plugins/build_plugin.py +++ b/morphlib/plugins/build_plugin.py @@ -107,7 +107,7 @@ class BuildPlugin(cliapp.Plugin): self.app.settings['cachedir'], self.app.settings['cachedir-min-space']) - system_name = args[0] + system_name = morphlib.util.strip_morph_extension(args[0]) ws = morphlib.workspace.open('.') sb = morphlib.sysbranchdir.open_from_within('.') diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index 09405aa4..1e86d44c 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -265,7 +265,7 @@ class DeployPlugin(cliapp.Plugin): self.app.settings['tempdir-min-space'], '/', 0) - cluster_name = args[0] + cluster_name = morphlib.util.strip_morph_extension(args[0]) env_vars = args[1:] ws = morphlib.workspace.open('.') |