openstack/python-openstackclient
Code Issues Proposed changes

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
parent 25051a733d 8939d26a5b
commit fd8197de6d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openstackclient/shell.py
View File

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