From 229cc241faf874f9e4fe1cd1624f5bd3ed808fbf Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 20 Aug 2018 11:10:40 -0400 Subject: [PATCH] [displaymanager] Massage do_autologin - Move getting the global setting closer to where it is used - Initialize variable --- src/modules/displaymanager/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 183188722..21c9115f1 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -731,7 +731,6 @@ def run(): "globalstorage and displaymanager.conf." ) - username = libcalamares.globalstorage.value("autologinUser") root_mount_point = libcalamares.globalstorage.value("rootMountPoint") if "default_desktop_environment" in libcalamares.job.configuration: @@ -767,11 +766,12 @@ def run(): libcalamares.utils.debug("{!s} selected but not installed".format(dm)) displaymanagers.remove(dm) + username = libcalamares.globalstorage.value("autologinUser") if username is not None: - libcalamares.utils.debug( - "Setting up autologin for user {!s}.".format(username) - ) + do_autologin = True + libcalamares.utils.debug("Setting up autologin for user {!s}.".format(username)) else: + do_autologin = False libcalamares.utils.debug("Unsetting autologin.") libcalamares.globalstorage.insert("displayManagers", displaymanagers)