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

Revert "Fix autologin-routine"

Browse Source 
This reverts commit 9c799b32e9.

This was already right before. default_desktop_environment.desktop_file is not a
variable, it's a field of a variable. This commit is not valid Python:
"SyntaxError: invalid syntax".
This commit is contained in:
Kevin Kofler 2014-11-28 18:40:49 +01:00
parent 9c799b32e9
commit e65d9c4f4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ def find_desktop_environment(root_mount_point):
return desktop_environment return desktop_environment
return None return None
def set_autologin(username, displaymanagers, default_desktop_environment.desktop_file, root_mount_point): def set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point):
""" Enables automatic login for the installed desktop managers """ """ Enables automatic login for the installed desktop managers """
if "mdm" in displaymanagers: if "mdm" in displaymanagers:
@ -175,7 +175,7 @@ def set_autologin(username, displaymanagers, default_desktop_environment.desktop
line = 'User={}\n'.format(username) line = 'User={}\n'.format(username)
# Session= line, commented out or with empty value # Session= line, commented out or with empty value
if re.match('\\s*#\\s*Session=|\\s*Session=$', line): if re.match('\\s*#\\s*Session=|\\s*Session=$', line):
if default_desktop_environment.desktop_file != None: if default_desktop_environment != None:
line = 'Session={}.desktop\n'.format(default_desktop_environment.desktop_file) line = 'Session={}.desktop\n'.format(default_desktop_environment.desktop_file)
sddm_conf.write(line) sddm_conf.write(line)
@ -322,6 +322,6 @@ def run():
if username != None: if username != None:
libcalamares.utils.debug( libcalamares.utils.debug(
"Setting up autologin for user %s." % username) "Setting up autologin for user %s." % username)
return set_autologin(username, displaymanagers, default_desktop_environment.desktop_file, root_mount_point) return set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point)
return None return None