Fix default desktop environment variable in displaymanager.

Summary: See {T55}

Test Plan: See D9 — this is the other fix required.

Reviewers: tsimonq2

Differential Revision: https://phab.lubuntu.me/D10

debian/changelog

@@ -1,9 +1,13 @@
 calamares (3.2.1-1ubuntu3) UNRELEASED; urgency=medium
 
+  [ Simon Quigley ]
   * Run wrap-and-sort.
   * Update Vcs-* for maintaining in Lubuntu.
   * Update Standards-version to 4.1.2, no changes needed.
 
+  [ Walter Lapchynski ]
+  * Fix default desktop environment variable in displaymanager.
+
  -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 20 Aug 2018 23:03:29 -0500
 
 calamares (3.2.1-1ubuntu2) cosmic; urgency=medium

debian/patches/fix-defaultde-variable.patch

@@ -0,0 +1,13 @@
+Description: Fix default desktop environment variable in displaymanager.
+Author: Walter Lapchynski <wxl@ubuntu.com>
+--- a/calamares-3.2.1/src/modules/displaymanager/main.py
++++ b/calamares-3.2.1/src/modules/displaymanager/main.py
+@@ -398,7 +398,7 @@ def run():
+     username = libcalamares.globalstorage.value("autologinUser")
+     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
+ 
+-    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"]

debian/patches/series

@@ -1,3 +1,4 @@
+fix-defaultde-variable.patch
 0001-replace-pkexec-by-sudo.patch
 0002-Add-patch-to-compile-with-pythonQt.patch
 0003-remove-wrong-path.patch