From 59fd4ee0823bd520a57b8f205cb9ea80a99fc2e2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 23 Feb 2023 20:38:29 +0100 Subject: [PATCH] [displaymanager] lightdm: logging errors Don't just use *any* file found in the xgreeters directory, and log when no greeter was found (outside of the translated error message). --- src/modules/displaymanager/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 11b707ece..8c1a44e1c 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -659,8 +659,6 @@ class DMlightdm(DisplayManager): desktop_names = [n for n in available_names if not n.startswith(".")] # .. otherwise any non-dot-file if desktop_names: return desktop_names[0] - if available_names: # Anything? - return available_names[0] return None @@ -683,6 +681,10 @@ class DMlightdm(DisplayManager): ) libcalamares.utils.debug("{!s} configured as greeter.".format(greeter)) else: + if greeter_path is None: + libcalamares.utils.error("No greeter found at all, preferred {!s}".format(self.preferred_greeters)) + else: + libcalamares.utils.error("Greeter {!s} selected but file does not exist".format(greeter_path)) return ( _("Cannot configure LightDM"), _("No LightDM greeter installed.")