Revert "Show version without supplying a dummy action"

This reverts commit 11b55be5bb.
Parsing before action will fail if one of the action specific options is used
As per issue #13743
pull/13754/head
Brian Coca 9 years ago
parent d26d76ea58
commit eb4ab5fa2a

@ -50,7 +50,7 @@ class GalaxyCLI(CLI):
SKIP_INFO_KEYS = ("name", "description", "readme_html", "related", "summary_fields", "average_aw_composite", "average_aw_score", "url" ) SKIP_INFO_KEYS = ("name", "description", "readme_html", "related", "summary_fields", "average_aw_composite", "average_aw_score", "url" )
VALID_ACTIONS = ("delete", "import", "info", "init", "install", "list", "login", "remove", "search", "setup") VALID_ACTIONS = ("delete", "import", "info", "init", "install", "list", "login", "remove", "search", "setup")
def __init__(self, args): def __init__(self, args):
self.api = None self.api = None
self.galaxy = None self.galaxy = None
@ -64,9 +64,6 @@ class GalaxyCLI(CLI):
epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0]) epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0])
) )
# Workaround for #12004: show version without supplying a dummy action
self.parser.parse_args()
self.set_action() self.set_action()
# options specific to actions # options specific to actions
@ -144,7 +141,7 @@ class GalaxyCLI(CLI):
return True return True
def run(self): def run(self):
super(GalaxyCLI, self).run() super(GalaxyCLI, self).run()
# if not offline, get connect to galaxy api # if not offline, get connect to galaxy api

@ -53,9 +53,6 @@ class VaultCLI(CLI):
epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0]) epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0])
) )
# Workaround for #12004: show version without supplying a dummy action
self.parser.parse_args()
self.set_action() self.set_action()
# options specific to self.actions # options specific to self.actions

Loading…
Cancel
Save