applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

displaymanager: Fix the default_desktop_environment option.

Browse source 
Do not use a YAML list when only a single entry actually works. (It was
just silently using the last one.)

Create the default_desktop_environment DesktopEnvironment tuple. Before,
the setting was silently ignored altogether.
This commit is contained in:
Kevin Kofler 2014-11-28 18:51:08 +01:00
parent e65d9c4f4d
commit 6f78ecab3b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/displaymanager/main.py
View file

@ -203,9 +203,8 @@ def run():
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
if "default_desktop_environment" in libcalamares.job.configuration:
for entry in libcalamares.job.configuration["default_desktop_environment"]:
executable = entry["executable"]
desktop_file = entry["desktop_file"]
entry = libcalamares.job.configuration["default_desktop_environment"]:
default_desktop_environment = DesktopEnvironment(entry["executable"], entry["desktop_file"])
if default_desktop_environment is None:
default_desktop_environment = find_desktop_environment(root_mount_point)