YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Catch not implemented prompt signal in app arguments parsing

Browse source
This commit is contained in:
Jérôme Lebleu 2016-05-22 21:38:59 +02:00
parent 6bf4307b44
commit 765a06bd14
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/app.py
View file

@ -1505,7 +1505,7 @@ def _parse_args_from_manifest(manifest, action, args={}, auth=None):
if arg_name in args: if arg_name in args:
arg_value = args[arg_name] arg_value = args[arg_name]
else: else:
if os.isatty(1) and 'ask' in arg: if 'ask' in arg:
# Retrieve proper ask string # Retrieve proper ask string
ask_string = _value_for_locale(arg['ask']) ask_string = _value_for_locale(arg['ask'])
@ -1520,7 +1520,10 @@ def _parse_args_from_manifest(manifest, action, args={}, auth=None):
# Check for a password argument # Check for a password argument
is_password = True if arg_type == 'password' else False is_password = True if arg_type == 'password' else False
try:
input_string = msignals.prompt(ask_string, is_password) input_string = msignals.prompt(ask_string, is_password)
except NotImplementedError:
input_string = None
if (input_string == '' or input_string is None) \ if (input_string == '' or input_string is None) \
and arg_default is not None: and arg_default is not None:
arg_value = arg_default arg_value = arg_default