From 9c799b32e91f36ef0dc20a91b2fff06f1c859590 Mon Sep 17 00:00:00 2001 From: Manjaro Linux Date: Fri, 28 Nov 2014 18:36:18 +0100 Subject: [PATCH] Fix autologin-routine default_desktop_environment.desktop_file needs to been passed actually. --- src/modules/displaymanager/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 8c97787c6..604dcb55d 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -48,7 +48,7 @@ def find_desktop_environment(root_mount_point): return desktop_environment return None -def set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point): +def set_autologin(username, displaymanagers, default_desktop_environment.desktop_file, root_mount_point): """ Enables automatic login for the installed desktop managers """ if "mdm" in displaymanagers: @@ -175,7 +175,7 @@ def set_autologin(username, displaymanagers, default_desktop_environment, root_m line = 'User={}\n'.format(username) # Session= line, commented out or with empty value if re.match('\\s*#\\s*Session=|\\s*Session=$', line): - if default_desktop_environment != None: + if default_desktop_environment.desktop_file != None: line = 'Session={}.desktop\n'.format(default_desktop_environment.desktop_file) sddm_conf.write(line) @@ -322,6 +322,6 @@ def run(): if username != None: libcalamares.utils.debug( "Setting up autologin for user %s." % username) - return set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point) + return set_autologin(username, displaymanagers, default_desktop_environment.desktop_file, root_mount_point) return None