summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-07 14:31:54 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 10:54:55 +0000
commitd79ea3978718aba1d4e3585de873b4a661428d07 (patch)
tree7e7b3d9baa60c2c774073a6cee7db523bfc8f491
parent0a94204ca8bfd1593aed1bb7c44d9c2cdad608dc (diff)
downloadmorph-d79ea3978718aba1d4e3585de873b4a661428d07.tar.gz
Patch buildcommand once, rather that once per system
-rw-r--r--morphlib/plugins/deploy_plugin.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index c1f26e46..71ca5a2c 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -261,6 +261,11 @@ class DeployPlugin(cliapp.Plugin):
'''
+ # Nasty hack to allow deploying things of a different architecture
+ def validate(self, root_artifact):
+ pass
+ morphlib.buildcommand.BuildCommand._validate_architecture = validate
+
if not args:
raise cliapp.AppException(
'Too few arguments to deploy command (see help)')
@@ -338,9 +343,6 @@ class DeployPlugin(cliapp.Plugin):
morph = system['morph']
srcpool = build_command.create_source_pool(build_repo, ref,
morph + '.morph')
- def validate(self, root_artifact):
- pass
- morphlib.buildcommand.BuildCommand._validate_architecture = validate
artifact = build_command.resolve_artifacts(srcpool)