From f8494f27d58ed7430fcb2bd10c2d4853502c9c89 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Wed, 17 Mar 2021 14:58:50 +0100 Subject: [PATCH 1/4] displaymanager from arcolinux --- src/modules/displaymanager/main.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index c75897efc..8c75baf29 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -175,7 +175,6 @@ desktop_environments = [ '/usr/bin/budgie-session', 'budgie-desktop' # Budgie v8 ), DesktopEnvironment('/usr/bin/gnome-session', 'gnome'), - DesktopEnvironment('/usr/bin/startxfce4', 'xfce'), DesktopEnvironment('/usr/bin/cinnamon-session-cinnamon', 'cinnamon'), DesktopEnvironment('/usr/bin/mate-session', 'mate'), DesktopEnvironment('/usr/bin/enlightenment_start', 'enlightenment'), @@ -184,9 +183,18 @@ desktop_environments = [ DesktopEnvironment('/usr/bin/lxqt-session', 'lxqt'), DesktopEnvironment('/usr/bin/pekwm', 'pekwm'), DesktopEnvironment('/usr/bin/pantheon-session', 'pantheon'), - DesktopEnvironment('/usr/bin/i3', 'i3'), DesktopEnvironment('/usr/bin/startdde', 'deepin'), - DesktopEnvironment('/usr/bin/openbox-session', 'openbox') + DesktopEnvironment('/usr/bin/startxfce4', 'xfce'), + DesktopEnvironment('/usr/bin/openbox-session', 'openbox'), + DesktopEnvironment('/usr/bin/i3', 'i3'), + DesktopEnvironment('/usr/bin/awesome', 'awesome'), + DesktopEnvironment('/usr/bin/bspwm', 'bspwm'), + DesktopEnvironment('/usr/bin/herbstluftwm', 'herbstluftwm'), + DesktopEnvironment('/usr/bin/qtile', 'qtile'), + DesktopEnvironment('/usr/bin/xmonad', 'xmonad'), + DesktopEnvironment('/usr/bin/dwm', 'dmw'), + DesktopEnvironment('/usr/bin/jwm', 'jwm'), + DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), ] From d19c3b5458de38afcef426aaba550e3889053328 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Sun, 28 Mar 2021 17:07:09 +0200 Subject: [PATCH 2/4] Update main.py Typo --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 8c75baf29..2b125cb68 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -192,7 +192,7 @@ desktop_environments = [ DesktopEnvironment('/usr/bin/herbstluftwm', 'herbstluftwm'), DesktopEnvironment('/usr/bin/qtile', 'qtile'), DesktopEnvironment('/usr/bin/xmonad', 'xmonad'), - DesktopEnvironment('/usr/bin/dwm', 'dmw'), + DesktopEnvironment('/usr/bin/dwm', 'dwm'), DesktopEnvironment('/usr/bin/jwm', 'jwm'), DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), ] From 9d4c2bf1c78c1c68cab6ddf86e1fdbd3a9ed28e3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 10:30:56 +0200 Subject: [PATCH 3/4] [displaymanager] Fix mismatch in spelling of "autologinUser" In 4ffa79d4cff4f0a6e65fbb53b110b0d3ac007b0a, the spelling was changed to consistently be "autoLoginUser" in the *users* module, but that changed the Global Storage key as well, and the *displaymanager* module wasn't changed to follow. --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 2b125cb68..fad03eede 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -954,7 +954,7 @@ def run(): else: enable_basic_setup = False - username = libcalamares.globalstorage.value("autologinUser") + username = libcalamares.globalstorage.value("autoLoginUser") if username is not None: do_autologin = True libcalamares.utils.debug("Setting up autologin for user {!s}.".format(username)) From 1184229c4afd021851ab2e085e7ca933e958d8e7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 30 Mar 2021 11:29:38 +0200 Subject: [PATCH 4/4] Changes: pre-release housekeeping --- CHANGES | 8 ++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 0c96bc47c..a62ff0f19 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,14 @@ This release contains contributions from (alphabetically by first name): - No module changes yet +# 3.2.39.1 (2021-03-30) # + +This hotfix release corrects a regression in the *displaymanager* +module caused by changes in the *users* module; autologin was +internally renamed and no longer recognized by the *displaymanager* +module. (Reported by Erik Dubois, #1665) + + # 3.2.39 (2021-03-19) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ad919c4f..db098644d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.40 + VERSION 3.2.39.1 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS #