kgess-mirror/openstack-python-openstackclient
1
0
Fork 0
mirror of https://opendev.org/openstack/python-openstackclient.git synced 2026-01-17 07:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix authentication setup in interactive mode and improve error handling so tracebacks are not printed twice"

Browse source
This commit is contained in:
Jenkins 2012-05-15 19:12:33 +00:00 • committed by Gerrit Code Review
commit fd8197de6d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
openstackclient/shell.py
View file

@ -196,9 +196,11 @@ class OpenStackShell(App):
# If the user is not asking for help, make sure they
# have given us auth.
cmd_info = self.command_manager.find_command(argv)
cmd_factory, cmd_name, sub_argv = cmd_info
if cmd_name != 'help':
cmd_name = None
if argv:
cmd_info = self.command_manager.find_command(argv)
cmd_factory, cmd_name, sub_argv = cmd_info
if self.interactive_mode or cmd_name != 'help':
self.authenticate_user()
def prepare_to_run_command(self, cmd):
@ -215,7 +217,10 @@ class OpenStackShell(App):
def main(argv=sys.argv[1:]):
return OpenStackShell().run(argv)
try:
return OpenStackShell().run(argv)
except:
return 1
if __name__ == "__main__":