CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ubuntu-release-upgrade: address mate screensaver not being disabled by t-r-u

Browse source
This commit is contained in:
Luis Guzmán 2026-03-23 14:12:42 -06:00
parent f255b26164
commit cbfef97277
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

0
helpers/DATA/ubuntu-release-upgrader/patch_changes/010_define_independent_solver.patch → helpers/DATA/ubuntu-release-upgrader/patch_changes/010-define_independent_solver.patch
View file

27
helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
index b7dd0af7..c06166b6 100644
--- a/DistUpgrade/DistUpgradeController.py
+++ b/DistUpgrade/DistUpgradeController.py
@@ -2708,10 +2708,18 @@ class DistUpgradeController(object):
# exits, the connection will be closed and screen inhibition
# will be removed.
self._session_bus = dbus.SessionBus()
- proxy = self._session_bus.get_object('org.freedesktop.ScreenSaver',
- '/org/freedesktop/ScreenSaver')
- screensaver = dbus.Interface(proxy, dbus_interface='org.freedesktop.ScreenSaver')
- screensaver.Inhibit('trisquel-release-upgrader', 'Upgrading Trisquel')
+ try:
+ # Attempt standar "generic"
+ proxy = self._session_bus.get_object('org.freedesktop.ScreenSaver',
+ '/org/freedesktop/ScreenSaver')
+ screensaver = dbus.Interface(proxy, dbus_interface='org.freedesktop.ScreenSaver')
+ screensaver.Inhibit('ubuntu-release-upgrader', 'Upgrading Ubuntu')
+ except Exception:
+ # Attempt MATE specific
+ proxy = self._session_bus.get_object('org.mate.ScreenSaver',
+ '/org/mate/ScreenSaver')
+ screensaver = dbus.Interface(proxy, dbus_interface='org.mate.ScreenSaver')
+ screensaver.Inhibit('ubuntu-release-upgrader', 'Upgrading Ubuntu')
summary = _("Lock screen disabled")
message = _("Your lock screen has been "

2
helpers/make-ubuntu-release-upgrader
View file

@ -25,7 +25,7 @@
# Also, don't forget to update the meta-release files at archive and packages.t.i
# The "obsoletes" list from ubuntu has been removed
VERSION=20
VERSION=20.9
. ./config
# Previous upstream release name, update for each release.