diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-08 23:05:11 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-12 11:00:09 +0100 |
| commit | 4f14465e968be2ff479ddfeaa6eb568881287bed (patch) | |
| tree | 56ba534b914c9f0312467ba3ac0292bcaa7a771c /morphlib/plugins | |
| parent | 1aaa11a10d03202063e15b6dd0a3b5217de51fc2 (diff) | |
| download | morph-4f14465e968be2ff479ddfeaa6eb568881287bed.tar.gz | |
Cut BuildBranch out of morphlib.extensions
This was previously used just so it could get the right repo and ref to
read the file out of.
However, there was a subtle bug in this behaviour, as if we had not
previously used morph build in that branch, it would attempt to read the
extensions from a branch which didn't exist.
So now it reads it from the working tree, which always exists.
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index 99ca6fc3..9f2d8eba 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -551,9 +551,8 @@ class DeployPlugin(cliapp.Plugin): system morphology (repo, ref), or with the Morph code. ''' - build_ref_prefix = self.app.settings['build-ref-prefix'] with morphlib.extensions.get_extension_filename( - build_ref_prefix, name, kind) as ext_filename: + name, kind) as ext_filename: self.app.status(msg='Running extension %(name)s%(kind)s', name=name, kind=kind) self.app.runcmd( |