From 766711069f674f7d48bc9d0ce406aae757cb8f7c Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Mon, 30 Aug 2021 13:25:32 +0200
Subject: [PATCH] [fix] Bad call to Moulinette.get

---
 src/yunohost/app.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 79944d340..f5e5dfd48 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -1867,12 +1867,12 @@ def app_config_set(operation_logger, app, key=None, value=None, args=None):
         logger.debug("Asking unanswered question and prevalidating...")
         args_dict = {}
         for panel in config_panel.get("panel", []):
-            if Moulinette.get('interface') == 'cli' and len(filter_key.split('.')) < 3:
+            if Moulinette.interface == 'cli' and len(filter_key.split('.')) < 3:
                 Moulinette.display(colorize("\n" + "=" * 40, 'purple'))
                 Moulinette.display(colorize(f">>>> {panel['name']}", 'purple'))
                 Moulinette.display(colorize("=" * 40, 'purple'))
             for section in panel.get("sections", []):
-                if Moulinette.get('interface') == 'cli' and len(filter_key.split('.')) < 3:
+                if Moulinette.interface == 'cli' and len(filter_key.split('.')) < 3:
                     Moulinette.display(colorize(f"\n# {section['name']}", 'purple'))
 
                 # Check and ask unanswered questions
@@ -2855,9 +2855,10 @@ class YunoHostArgumentFormatParser(object):
     def parse(self, question, user_answers):
         question = self.parse_question(question, user_answers)
 
+<<<<<<< HEAD
         while True:
             # Display question if no value filled or if it's a readonly message
-            if Moulinette.get('interface') == 'cli':
+            if Moulinette.interface == 'cli':
                 text_for_user_input_in_cli = self._format_text_for_user_input_in_cli(
                     question
                 )
@@ -2893,7 +2894,7 @@ class YunoHostArgumentFormatParser(object):
             try:
                 self._prevalidate(question)
             except YunohostValidationError as e:
-                if Moulinette.get('interface') == 'api':
+                if Moulinette.interface == 'api':
                     raise
                 Moulinette.display(str(e), 'error')
                 question.value = None
@@ -3179,7 +3180,7 @@ class FileArgumentParser(YunoHostArgumentFormatParser):
     @classmethod
     def clean_upload_dirs(cls):
         # Delete files uploaded from API
-        if Moulinette.get('interface') == 'api':
+        if Moulinette.interface == 'api':
             for upload_dir in cls.upload_dirs:
                 if os.path.exists(upload_dir):
                     shutil.rmtree(upload_dir)
@@ -3192,7 +3193,7 @@ class FileArgumentParser(YunoHostArgumentFormatParser):
             question_parsed.accept = question.get('accept').replace(' ', '').split(',')
         else:
             question_parsed.accept = []
-        if Moulinette.get('interface') == 'api':
+        if Moulinette.interface == 'api':
             if user_answers.get(question_parsed.name):
                 question_parsed.value = {
                     'content': question_parsed.value,
@@ -3223,7 +3224,7 @@ class FileArgumentParser(YunoHostArgumentFormatParser):
         if not question.value:
             return question.value
 
-        if Moulinette.get('interface') == 'api':
+        if Moulinette.interface == 'api':
 
             upload_dir = tempfile.mkdtemp(prefix='tmp_configpanel_')
             FileArgumentParser.upload_dirs += [upload_dir]