From 96c89fc08011a8f4532e60989efb784624626529 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 27 Sep 2021 20:29:03 +0200 Subject: [PATCH] [displaymanager] Fix Python errors Apparently nobody ever hit the else-branch here (because each DM has exactly one implementation -- that's what the check is there for!) because the logging of the error itself would raise IndexError or ValueError. --- src/modules/displaymanager/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 8b63b9e8d..5fb228682 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -198,7 +198,7 @@ desktop_environments = [ DesktopEnvironment('/usr/bin/fvwm3', 'fvwm3'), DesktopEnvironment('/usr/bin/sway', 'sway'), DesktopEnvironment('/usr/bin/ukui-session', 'ukui'), - DesktopEnvironment('/usr/bin/cutefish-session', 'cutefish-xsession'), + DesktopEnvironment('/usr/bin/cutefish-session', 'cutefish-xsession'), ] @@ -923,7 +923,7 @@ def run(): else: dm_instance = None else: - libcalamares.utils.debug("{!s} has {!d} implementation classes.".format(dm).format(len(impl))) + libcalamares.utils.debug("{!s} has {!s} implementation classes.".format(dm, len(impl))) if dm_instance is None: libcalamares.utils.debug("{!s} selected but not installed".format(dm))