summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-02-07 11:00:13 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-02-07 11:00:13 +0000
commit2df1538cc3fdbfbd9a0a5a9d6d3640856ea6730c (patch)
treec2d378eb1ffb104d3581a5d2a5137df0827275bb
parent626bf72a572d8852e069c75553c5d121a29bf587 (diff)
downloadmorph-2df1538cc3fdbfbd9a0a5a9d6d3640856ea6730c.tar.gz
Describe how we re-use code from branch+merge plugin
Suggested-By: Sam Thursfield
-rw-r--r--morphlib/plugins/deploy_plugin.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index eff1377c..63fe647b 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -24,6 +24,12 @@ import urlparse
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