openstack/python-openstackclient
Code Issues Proposed changes

Merge "If no password in env or command line, try prompting."

Browse Source
This commit is contained in:
Jenkins 2012-07-05 16:56:35 +00:00 committed by Gerrit Code Review
commit 2223308983
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstackclient/shell.py
View File

@ -19,6 +19,7 @@
Command-line interface to the OpenStack APIs
"""
import getpass
import logging
import os
import sys
@ -149,9 +150,20 @@ class OpenStackShell(App):
" either --os-username or env[OS_USERNAME]")
if not self.options.os_password:
raise exc.CommandError(
"You must provide a password via"
" either --os-password or env[OS_PASSWORD]")
# No password, if we've got a tty, try prompting for it
if hasattr(sys.stdin, 'isatty') and sys.stdin.isatty():
# Check for Ctl-D
try:
self.options.os_password = getpass.getpass()
except EOFError:
pass
# No password because we did't have a tty or the
# user Ctl-D when prompted?
if not self.options.os_password:
raise exc.CommandError(
"You must provide a password via"
" either --os-password, or env[OS_PASSWORD], "
" or prompted response")
if not (self.options.os_tenant_id or self.options.os_tenant_name):
raise exc.CommandError(