Merge branch 'master' into refactor-dm

This commit is contained in:
Adriaan de Groot 2018-08-20 17:25:26 -04:00
commit 858c959285
7 changed files with 46 additions and 43 deletions

View file

@ -775,7 +775,7 @@ def run():
# Pick up remaining settings
if "default_desktop_environment" in libcalamares.job.configuration:
if "defaultDesktopEnvironment" in libcalamares.job.configuration:
entry = libcalamares.job.configuration["defaultDesktopEnvironment"]
default_desktop_environment = DesktopEnvironment(
entry["executable"], entry["desktopFile"]