openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Remove log translations"

This commit is contained in:
Jenkins 2017-04-25 19:24:09 +00:00 committed by Gerrit Code Review
parent c940fca913 020e512973
commit e0d1ddc4c9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleoclient/utils.py
View File

@ -30,7 +30,6 @@ import yaml
from heatclient.common import event_utils
from heatclient.exc import HTTPNotFound
from osc_lib.i18n import _
from osc_lib.i18n import _LI
from six.moves import configparser
from tripleoclient import exceptions
@ -711,22 +710,22 @@ def prompt_user_for_confirmation(message, logger, positive_response='y'):
"""
try:
if not sys.stdin.isatty():
logger.error(_LI('User interaction required, cannot confirm.'))
logger.error(_('User interaction required, cannot confirm.'))
return False
else:
sys.stdout.write(message)
prompt_response = sys.stdin.readline().lower()
if not prompt_response.startswith(positive_response):
logger.info(_LI(
logger.info(_(
'User did not confirm action so taking no action.'))
return False
logger.info(_LI('User confirmed action.'))
logger.info(_('User confirmed action.'))
return True
except KeyboardInterrupt: # ctrl-c
logger.info(_LI(
logger.info(_(
'User did not confirm action (ctrl-c) so taking no action.'))
except EOFError: # ctrl-d
logger.info(_LI(
logger.info(_(
'User did not confirm action (ctrl-d) so taking no action.'))
return False