napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[displaymanager] lightdm: logging errors

Browse Source 
Don't just use *any* file found in the xgreeters directory,
and log when no greeter was found (outside of the translated
error message).
This commit is contained in:
Adriaan de Groot 2023-02-23 20:38:29 +01:00
parent bbc9d90888
commit 59fd4ee082
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/displaymanager/main.py
View File

@ -659,8 +659,6 @@ class DMlightdm(DisplayManager):
desktop_names = [n for n in available_names if not n.startswith(".")] # .. otherwise any non-dot-file desktop_names = [n for n in available_names if not n.startswith(".")] # .. otherwise any non-dot-file
if desktop_names: if desktop_names:
return desktop_names[0] return desktop_names[0]
if available_names: # Anything?
return available_names[0]
return None return None
@ -683,6 +681,10 @@ class DMlightdm(DisplayManager):
) )
libcalamares.utils.debug("{!s} configured as greeter.".format(greeter)) libcalamares.utils.debug("{!s} configured as greeter.".format(greeter))
else: 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 ( return (
_("Cannot configure LightDM"), _("Cannot configure LightDM"),
_("No LightDM greeter installed.") _("No LightDM greeter installed.")