From 4ef8ded762c93b8b797802cb3abf02c8b7d92b0b Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Tue, 21 Aug 2018 00:13:41 -0500 Subject: [PATCH] Fix default desktop environment variable in displaymanager. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: See {T55} Test Plan: See D9 — this is the other fix required. Reviewers: tsimonq2 Differential Revision: https://phab.lubuntu.me/D10 --- debian/changelog | 4 ++++ debian/patches/fix-defaultde-variable.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+) create mode 100644 debian/patches/fix-defaultde-variable.patch diff --git a/debian/changelog b/debian/changelog index f771715..e2e3077 100644 --- a/debian/changelog +++ b/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 Mon, 20 Aug 2018 23:03:29 -0500 calamares (3.2.1-1ubuntu2) cosmic; urgency=medium diff --git a/debian/patches/fix-defaultde-variable.patch b/debian/patches/fix-defaultde-variable.patch new file mode 100644 index 0000000..6c8236e --- /dev/null +++ b/debian/patches/fix-defaultde-variable.patch @@ -0,0 +1,13 @@ +Description: Fix default desktop environment variable in displaymanager. +Author: Walter Lapchynski +--- 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"] diff --git a/debian/patches/series b/debian/patches/series index bb52cef..b146923 100644 --- a/debian/patches/series +++ b/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