[Merge] lp:~darkxst/ubuntu-release-upgrader/gnome-session-inhibit into lp:ubuntu-release-upgrader

[Brian Murray]

The release upgrade process downloads a tarball of the release-upgrader from the archive for the target release e.g. http://archive.ubuntu.com/ubuntu/dists/xenial/main/dist-upgrader-all/current/xeinal.tar.gz then extracts it to a directory in /tmp/ and then runs xenial in that temporary directory.  You could test it by either starting an upgrade, choosing to quit, and then make changes in /tmp/$tmpdir/DistUpgradeQuirks.py or build the package and manually extract dist-upgrader_$vernum.tar.gz.

Diff comments:

> === modified file 'DistUpgrade/DistUpgradeQuirks.py'
> --- DistUpgrade/DistUpgradeQuirks.py	2016-03-30 03:39:16 +0000
> +++ DistUpgrade/DistUpgradeQuirks.py	2016-04-02 05:17:58 +0000
> @@ -405,6 +406,18 @@
>              except:
>                  logging.exception("failed to setup screensaver poke")
>  
> +    def _inhibitIdle(self):
> +        if os.path.exists("/usr/bin/gnome-session-inhibit"):
> +            logging.debug("inhibit gnome-session idle")
> +            _idle = subprocess.Popen(["gnome-session-inhibit","--inhibit", 
> +                                      "idle", "--inhibit-only"])

What effect will running this on a system that is running Unity?

> +            # leave the inhibitor in place on Ubuntu GNOME, since the
> +            # lock screen will be broken after upgrade
> +            desktop = os.environ.get("XDG_CURRENT_DESKTOP").split(':')
> +            if "GNOME" not in desktop:
> +                atexit.register(_idle.terminate);
> +
> +
>      def _stopPokeScreensaver(self):
>          res = False
>          if self._poke is not None:
> 
> === modified file 'debian/changelog'
> --- debian/changelog	2016-03-30 03:39:16 +0000
> +++ debian/changelog	2016-04-02 05:17:58 +0000
> @@ -1,5 +1,6 @@
> -ubuntu-release-upgrader (1:16.04.9) UNRELEASED; urgency=medium
> +ubuntu-release-upgrader (1:16.04.9ubuntu1) UNRELEASED; urgency=medium

There's no need to use 9ubuntu1 here, just keep the version at 16.04.9.

>  
> +  [ Mathieu Trudel-Lapierre ]
>    * DistUpgrade/DistUpgradeController.py: fix typo in variable name for
>      RELEASE_UPGRADER_ALLOW_THIRD_PARTY; this will help running with third-
>      party mirrors in sources via just the environment variable for one-shot


-- 
https://code.launchpad.net/~darkxst/ubuntu-release-upgrader/gnome-session-inhibit/+merge/290792
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~darkxst/ubuntu-release-upgrader/gnome-session-inhibit into lp:ubuntu-release-upgrader.