summaryrefslogtreecommitdiff
path: root/morphlib/plugins
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-05-22 09:33:15 +0100
committerBaserock Gerrit <gerrit@baserock.org>2015-05-27 14:15:51 +0000
commit4ce4366ca03873da4c11000b564dbcd487399e59 (patch)
treed63ae3f12066c974322e7afb2f0b3c4e7dd253cb /morphlib/plugins
parent05b2b062afa2ab4cbd504735fd16cf53d969a2a5 (diff)
downloadmorph-4ce4366ca03873da4c11000b564dbcd487399e59.tar.gz
Ignore --upgrade flag rather than exiting
Specifying --upgrade with the upgrade command is redundant, but it's not a contradiction, so we can safely ignore --upgrade if it happens to be specified with the upgrade command. Change-Id: I94213f3e45ce58a3c91f7be0ccca63b0eec9561c
Diffstat (limited to 'morphlib/plugins')
-rw-r--r--morphlib/plugins/deploy_plugin.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index c1ec12a8..7ab2e64b 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -571,10 +571,6 @@ class DeployPlugin(cliapp.Plugin):
'Too few arguments to upgrade command (see `morph help '
'deploy`)')
- if self.app.settings['upgrade']:
- raise cliapp.AppException(
- 'Running `morph upgrade --upgrade` does not make sense.')
-
self.app.settings['upgrade'] = True
self.deploy(args)