From 674d8e7cb970d982e8cf41961c7306bb420dbfae Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 16 Sep 2020 17:01:21 +0200 Subject: [PATCH] [fix] Minor issues in app questions parsing --- src/yunohost/app.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 97dc09621..300cc07b5 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -2542,7 +2542,7 @@ class YunoHostArgumentFormatParser(object): question.value = None # we don't have an answer, check optional and default_value - if question.value is None: + if question.value is None or question.value == '': if not question.optional and question.default is None: raise YunohostError('app_argument_required', name=question.name) else: @@ -2566,12 +2566,12 @@ class YunoHostArgumentFormatParser(object): def _format_text_for_user_input_in_cli(self, question): text_for_user_input_in_cli = _value_for_locale(question.ask) - if question.default is not None: - text_for_user_input_in_cli += ' (default: {0})'.format(question.default) - if question.choices: text_for_user_input_in_cli += ' [{0}]'.format(' | '.join(question.choices)) + if question.default is not None: + text_for_user_input_in_cli += ' (default: {0})'.format(question.default) + return text_for_user_input_in_cli def _post_parse_value(self, question):