Merge lp:~brian-murray/ubuntu-release-upgrader/improve-inhibit-idle into lp:ubuntu-release-upgrader

[Brian Murray]

It seems safer to continue to inhibit gnome-session idle so that people are not locked out of their system after upgrading, but we should warn them that this will be happening.

[Sebastien Bacher (seb128)]

The changes seem fine to me

review: Approve

[Steve Langasek (vorlon)]

one wording suggestion.

review: Approve

[lp:~brian-murray/ubuntu-release-upgrader/improve-inhibit-idle]

3143. By Brian Murray on 2018-07-06

modify wording based off reviewer feedback

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2018-06-27 23:34:19 +0000
+++ DistUpgrade/DistUpgradeController.py	2018-07-06 17:47:44 +0000
@@ -188,6 +188,9 @@
 
         # apt cron job
         self._aptCronJobPerms = 0o755
+        # for inhibiting idle
+        self._uid = ''
+        self._user_env = {}
 
     def openCache(self, lock=True, restore_sources_list_on_fail=False):
         logging.debug("openCache()")
@@ -1894,6 +1897,7 @@
         self._view.updateStatus(_("Calculating the changes"))
         if not self.askDistUpgrade():
             self.abort()
+        self._inhibitIdle()
 
         # fetch the stuff
         self._view.setStep(Step.FETCH)
@@ -1984,6 +1988,57 @@
                                    _("The partial upgrade was completed."))
         return True
 
+    def _inhibitIdle(self):
+        if os.path.exists("/usr/bin/gnome-session-inhibit"):
+            self._uid = os.environ.get('SUDO_UID', '')
+            if not self._uid:
+                self._uid = os.environ.get('PKEXEC_UID', '')
+            if not self._uid:
+                logging.debug("failed to determine user upgrading")
+                logging.error("failed to inhibit gnome-session idle")
+                return
+            self._getUserEnv()
+            if not self._user_env:
+                return
+            #seteuid so dbus user session can be accessed
+            os.seteuid(int(self._uid))
+
+            logging.debug("inhibit gnome-session idle")
+            try:
+                xdg_desktop = self._user_env.get("XDG_CURRENT_DESKTOP", "")
+                if not xdg_desktop:
+                    logging.debug("failed to find XDG_CURRENT_DESKTOP")
+                    logging.error("failed to inhibit gnome-session idle")
+                    return
+                idle = subprocess.Popen(["gnome-session-inhibit", "--inhibit",
+                                         "idle", "--inhibit-only"],
+                                        env=self._user_env)
+                self._view.information(_("Lock screen disabled"),
+                                       _("Your lock screen has been "
+                                         "disabled and will remain "
+                                         "disabled until you reboot."))
+            except (OSError, ValueError):
+                logging.exception("failed to inhibit gnome-session idle")
+            os.seteuid(os.getuid())
+
+    def _getUserEnv(self):
+        try:
+            pid = subprocess.check_output(["pgrep", "-u", self._uid,
+                                           "gnome-session"])
+            pid = pid.decode().split('\n')[0]
+            with open('/proc/' + pid + '/environ', 'r') as f:
+                data = f.read().split('\x00')
+            for line in data:
+                if len(line):
+                    env = line.split('=', 1)
+                    self._user_env[env[0]] = env[1]
+        except subprocess.CalledProcessError as e:
+            if e.returncode == 1:
+                logging.debug("gnome-session not running for user")
+            else:
+                logging.exception("failed to read user env")
+
+
 
 if __name__ == "__main__":
     from .DistUpgradeViewText import DistUpgradeViewText

=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py	2017-07-13 22:49:22 +0000
+++ DistUpgrade/DistUpgradeQuirks.py	2018-07-06 17:47:44 +0000
@@ -60,8 +60,6 @@
         self.arch = get_arch()
         self.plugin_manager = PluginManager(self.controller, ["./plugins"])
         self._poke = None
-        self._uid = ''
-        self._user_env = {}
 
     # the quirk function have the name:
     #  $Name (e.g. PostUpgrade)
@@ -137,7 +135,6 @@
         self._killKBluetooth()
         self._killScreensaver()
         self._pokeScreensaver()
-        self._inhibitIdle()
         self._stopDocvertConverter()
 
     # individual quirks handler that run *after* the dist-upgrade was
@@ -388,7 +385,7 @@
     def _pokeScreensaver(self):
         if (os.path.exists("/usr/bin/xdg-screensaver") and
                 os.environ.get('DISPLAY')):
-            logging.debug("setup poke timer for the scrensaver")
+            logging.debug("setup poke timer for the screensaver")
             cmd = "while true;"
             cmd += " do /usr/bin/xdg-screensaver reset >/dev/null 2>&1;"
             cmd += " sleep 30; done"
@@ -398,58 +395,6 @@
             except (OSError, ValueError):
                 logging.exception("failed to setup screensaver poke")
 
-    def _getUserEnv(self):
-        try:
-            pid = subprocess.check_output(["pgrep", "-u", self._uid,
-                                           "gnome-session"])
-            pid = pid.decode().split('\n')[0]
-            with open('/proc/' + pid + '/environ', 'r') as f:
-                data = f.read().split('\x00')
-            for line in data:
-                if len(line):
-                    env = line.split('=', 1)
-                    self._user_env[env[0]] = env[1]
-        except subprocess.CalledProcessError as e:
-            if e.returncode == 1:
-                logging.debug("gnome-session not running for user")
-            else:
-                logging.exception("failed to read user env")
-
-    def _inhibitIdle(self):
-        if os.path.exists("/usr/bin/gnome-session-inhibit"):
-            self._uid = os.environ.get('SUDO_UID', '')
-            if not self._uid:
-                self._uid = os.environ.get('PKEXEC_UID', '')
-            if not self._uid:
-                logging.debug("failed to determine user upgrading")
-                logging.error("failed to inhibit gnome-session idle")
-                return
-            self._getUserEnv()
-            if not self._user_env:
-                return
-            #seteuid so dbus user session can be accessed
-            os.seteuid(int(self._uid))
-
-            logging.debug("inhibit gnome-session idle")
-            try:
-                xdg_desktop = self._user_env.get("XDG_CURRENT_DESKTOP", "")
-                if not xdg_desktop:
-                    logging.debug("failed to find XDG_CURRENT_DESKTOP")
-                    logging.error("failed to inhibit gnome-session idle")
-                    return
-                xdg_desktop = xdg_desktop.split(':')
-                idle = subprocess.Popen(["gnome-session-inhibit", "--inhibit",
-                                         "idle", "--inhibit-only"],
-                                        env=self._user_env)
-                # leave the inhibitor in place on Ubuntu GNOME, since the
-                # lock screen will be broken after upgrade (LP: #1565178)
-                for desktop in xdg_desktop:
-                    if "GNOME" not in desktop:
-                        atexit.register(idle.terminate)
-            except (OSError, ValueError):
-                logging.exception("failed to inhibit gnome-session idle")
-            os.seteuid(os.getuid())
-
     def _stopPokeScreensaver(self):
         res = False
         if self._poke is not None:

=== modified file 'debian/changelog'
--- debian/changelog	2018-06-27 23:34:34 +0000
+++ debian/changelog	2018-07-06 17:47:44 +0000
@@ -1,3 +1,13 @@
+ubuntu-release-upgrader (1:18.10.4) UNRELEASED; urgency=medium
+
+  * DistUpgradeQuirks.py, DistUpgradeController.py: move inhibiting of
+    gnome-session idle so that it is called immediately after the upgrade
+    starts (LP: #1778817), present a dialog notifying that the lock screen has
+    been disabled (LP: #1174093), and do not reenable the lock screen as it
+    may fail to work after a release upgrade. (LP: #1780342)
+
+ -- Brian Murray <[e-mail]>  Thu, 05 Jul 2018 16:17:42 -0700
+
 ubuntu-release-upgrader (1:18.10.3) cosmic; urgency=medium
 
   [ Dimitri John Ledkov ]