From 70bf38ce25f0e6e10a52d03b6396f965ea50f665 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 27 Nov 2022 00:32:08 +0100
Subject: [PATCH] settings: fix output format for 'yunohost settings list'

---
 src/settings.py            | 15 +++++----------
 src/tests/test_settings.py |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/settings.py b/src/settings.py
index a245486fe..0f11c87f1 100644
--- a/src/settings.py
+++ b/src/settings.py
@@ -53,24 +53,19 @@ def settings_get(key="", full=False, export=False):
     else:
         mode = "classic"
 
-    if mode == "classic" and key == "":
-        raise YunohostValidationError("Missing key", raw_msg=True)
-
     settings = SettingsConfigPanel()
     key = translate_legacy_settings_to_configpanel_settings(key)
     return settings.get(key, mode)
 
 
-def settings_list(full=False, export=True):
-    """
-    List all entries of the settings
+def settings_list(full=False):
 
-    """
+    settings = settings_get(full=full)
 
     if full:
-        export = False
-
-    return settings_get(full=full, export=export)
+        return settings
+    else:
+        return {k: v for k, v in settings.items() if not k.startswith("security.root_access")}
 
 
 @is_unit_operation()
diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py
index e862e4377..b6899d763 100644
--- a/src/tests/test_settings.py
+++ b/src/tests/test_settings.py
@@ -207,7 +207,7 @@ def test_settings_set_bad_value_select():
 
 def test_settings_list_modified():
     settings_set("example.example.number", 21)
-    assert settings_list()["number"] == 21
+    assert settings_list()["example.example.number"]["value"] == 21
 
 
 def test_reset():