diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-03-07 14:31:14 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-03-14 10:54:55 +0000 |
| commit | 0a94204ca8bfd1593aed1bb7c44d9c2cdad608dc (patch) | |
| tree | f8a9f154802531920d0d04d50c1ef940b3dac36d | |
| parent | a9e19c96b345106a6bc564271d02d094b67bd10c (diff) | |
| download | morph-0a94204ca8bfd1593aed1bb7c44d9c2cdad608dc.tar.gz | |
Remove ugly loading of old b&m plugin
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index 61e1b5a4..c1f26e46 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -26,13 +26,6 @@ import uuid import morphlib -# UGLY HACK: We need to re-use some code from the branch and merge -# plugin, so we import and instantiate that plugin. This needs to -# be fixed by refactoring the codebase so the shared code is in -# morphlib, not in a plugin. However, this hack lets us re-use -# code without copying it. -import morphlib.plugins.branch_and_merge_plugin - class ExtensionNotFoundError(morphlib.Error): pass @@ -51,9 +44,6 @@ class DeployPlugin(cliapp.Plugin): self.app.add_subcommand( 'deploy', self.deploy, arg_synopsis='CLUSTER [SYSTEM.KEY=VALUE]') - self.other = \ - morphlib.plugins.branch_and_merge_plugin.BranchAndMergePlugin() - self.other.app = self.app def disable(self): pass |