From 4ce4366ca03873da4c11000b564dbcd487399e59 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Fri, 22 May 2015 09:33:15 +0100 Subject: 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 --- morphlib/plugins/deploy_plugin.py | 4 ---- 1 file changed, 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) -- cgit v1.2.1