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

[displaymanager] Massage do_autologin

Browse Source 
- Move getting the global setting closer to where it is used
 - Initialize variable
This commit is contained in:
Adriaan de Groot 2018-08-20 11:10:40 -04:00
parent 59a003a41f
commit 229cc241fa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,7 +731,6 @@ def run():
"globalstorage and displaymanager.conf." "globalstorage and displaymanager.conf."
) )
username = libcalamares.globalstorage.value("autologinUser")
root_mount_point = libcalamares.globalstorage.value("rootMountPoint") root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
if "default_desktop_environment" in libcalamares.job.configuration: if "default_desktop_environment" in libcalamares.job.configuration:
@ -767,11 +766,12 @@ def run():
libcalamares.utils.debug("{!s} selected but not installed".format(dm)) libcalamares.utils.debug("{!s} selected but not installed".format(dm))
displaymanagers.remove(dm) displaymanagers.remove(dm)
username = libcalamares.globalstorage.value("autologinUser")
if username is not None: if username is not None:
libcalamares.utils.debug( do_autologin = True
"Setting up autologin for user {!s}.".format(username) libcalamares.utils.debug("Setting up autologin for user {!s}.".format(username))
)
else: else:
do_autologin = False
libcalamares.utils.debug("Unsetting autologin.") libcalamares.utils.debug("Unsetting autologin.")
libcalamares.globalstorage.insert("displayManagers", displaymanagers) libcalamares.globalstorage.insert("displayManagers", displaymanagers)