diff -Nru ubuntu-release-upgrader-16.04.11/data/demoted.cfg ubuntu-release-upgrader-16.04.12/data/demoted.cfg --- ubuntu-release-upgrader-16.04.11/data/demoted.cfg 2016-04-14 21:49:47.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/data/demoted.cfg 2016-04-16 00:07:48.000000000 +0000 @@ -19,7 +19,6 @@ autoconf2.64 automake1.11 automoc -autopoint bacula bacula-client bacula-common @@ -96,17 +95,11 @@ dblatex dbus-test-runner debiandoc-sgml -default-jdk deja-dup-backend-gvfs dejagnu -device-tree-compiler dh-apparmor dh-apport -dh-autoreconf dh-buildinfo -dh-di -dh-exec -dh-golang dh-lua dh-migrations dh-modaliases @@ -335,7 +328,6 @@ kdelibs5-dbg kdelibs5-dev kdoctools -kernel-wedge keymapper konwert konwert-dev @@ -559,6 +551,7 @@ libcrypt-openssl-random-perl libcrypt-rijndael-perl libcss-minifier-xs-perl +libcuda1-340-updates libcuda1-352 libcuda1-352-updates libcunit1 @@ -773,6 +766,7 @@ libipc-run3-perl libipc-sharedcache-perl libipc-sharelite-perl +libirman-dev libisoburn-dbg libisoburn-dev libisoburn-doc @@ -1329,9 +1323,6 @@ munin-node munin-plugins-core munin-plugins-extra -mysql-client -mysql-common -mysql-server nant nasm naturaldocs @@ -1339,6 +1330,7 @@ ninja-build ninja-build-doc numlockx +nvidia-opencl-icd-340-updates nvidia-opencl-icd-352 nvidia-opencl-icd-352-updates ocaml diff -Nru ubuntu-release-upgrader-16.04.11/data/demoted.cfg.trusty ubuntu-release-upgrader-16.04.12/data/demoted.cfg.trusty --- ubuntu-release-upgrader-16.04.11/data/demoted.cfg.trusty 2016-04-14 21:50:29.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/data/demoted.cfg.trusty 2016-04-16 00:08:51.000000000 +0000 @@ -17,7 +17,6 @@ autoconf2.64 automake1.11 automoc -autopoint bacula bacula-client bacula-common @@ -94,16 +93,11 @@ dblatex dbus-test-runner debiandoc-sgml -default-jdk deja-dup-backend-gvfs dejagnu -device-tree-compiler dh-apparmor dh-apport -dh-autoreconf dh-buildinfo -dh-di -dh-exec dh-linktree dh-migrations dh-modaliases @@ -328,7 +322,6 @@ kdelibs5-dbg kdelibs5-dev kdoctools -kernel-wedge keymapper konwert konwert-dev @@ -720,6 +713,7 @@ libipc-run3-perl libipc-sharedcache-perl libipc-sharelite-perl +libirman-dev libisoburn-dbg libisoburn-dev libisoburn-doc @@ -1265,9 +1259,6 @@ munin-node munin-plugins-core munin-plugins-extra -mysql-client -mysql-common -mysql-server nant nasm naturaldocs diff -Nru ubuntu-release-upgrader-16.04.11/data/mirrors.cfg ubuntu-release-upgrader-16.04.12/data/mirrors.cfg --- ubuntu-release-upgrader-16.04.11/data/mirrors.cfg 2016-04-14 21:50:38.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/data/mirrors.cfg 2016-04-16 00:09:01.000000000 +0000 @@ -143,7 +143,6 @@ http://mirrors.us.kernel.org/ubuntu/ http://softlibre.unizar.es/ubuntu/archive/ http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/ -http://giano.com.dist.unige.it/ubuntu/ http://mirrors.nl.eu.kernel.org/ubuntu/ http://mirrors.se.eu.kernel.org/ubuntu/ http://mirror.mirohost.net/ubuntu/ @@ -405,7 +404,6 @@ http://artfiles.org/ubuntu.com/ http://mirrors.ccs.neu.edu/ubuntu/ http://mirrors.maine.edu/ubuntu/ -http://ftp.klid.dk/ftp/ubuntu/ http://mirrors.nhanhoa.com/ubuntu/ http://mirror.mythic-beasts.com/ubuntu/ http://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ @@ -450,7 +448,6 @@ http://ftp.iinet.net.au/pub/ubuntu/ http://www.las.ic.unicamp.br/pub/ubuntu/ http://ubuntu.ntc.net.np/ubuntu/ -http://mirror.n5tech.com/ubuntu/ http://mirror.sax.uk.as61049.net/ubuntu/ http://ftp.aso.ee/ubuntu/ http://ftp.rezopole.net/ubuntu/ diff -Nru ubuntu-release-upgrader-16.04.11/debian/changelog ubuntu-release-upgrader-16.04.12/debian/changelog --- ubuntu-release-upgrader-16.04.11/debian/changelog 2016-04-14 21:45:32.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/debian/changelog 2016-04-16 00:11:13.000000000 +0000 @@ -1,3 +1,10 @@ +ubuntu-release-upgrader (1:16.04.12) xenial; urgency=medium + + * DistUpgradeQuirks.py: Fix the quirk which inhibits screensavers. + (LP: #1570947) + + -- Brian Murray Fri, 15 Apr 2016 17:11:11 -0700 + ubuntu-release-upgrader (1:16.04.11) xenial; urgency=medium [ Tim Lunn ] diff -Nru ubuntu-release-upgrader-16.04.11/DistUpgrade/demoted.cfg.trusty ubuntu-release-upgrader-16.04.12/DistUpgrade/demoted.cfg.trusty --- ubuntu-release-upgrader-16.04.11/DistUpgrade/demoted.cfg.trusty 2016-04-14 21:50:29.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/DistUpgrade/demoted.cfg.trusty 2016-04-16 00:08:51.000000000 +0000 @@ -17,7 +17,6 @@ autoconf2.64 automake1.11 automoc -autopoint bacula bacula-client bacula-common @@ -94,16 +93,11 @@ dblatex dbus-test-runner debiandoc-sgml -default-jdk deja-dup-backend-gvfs dejagnu -device-tree-compiler dh-apparmor dh-apport -dh-autoreconf dh-buildinfo -dh-di -dh-exec dh-linktree dh-migrations dh-modaliases @@ -328,7 +322,6 @@ kdelibs5-dbg kdelibs5-dev kdoctools -kernel-wedge keymapper konwert konwert-dev @@ -720,6 +713,7 @@ libipc-run3-perl libipc-sharedcache-perl libipc-sharelite-perl +libirman-dev libisoburn-dbg libisoburn-dev libisoburn-doc @@ -1265,9 +1259,6 @@ munin-node munin-plugins-core munin-plugins-extra -mysql-client -mysql-common -mysql-server nant nasm naturaldocs diff -Nru ubuntu-release-upgrader-16.04.11/DistUpgrade/DistUpgradeQuirks.py ubuntu-release-upgrader-16.04.12/DistUpgrade/DistUpgradeQuirks.py --- ubuntu-release-upgrader-16.04.11/DistUpgrade/DistUpgradeQuirks.py 2016-04-14 16:43:36.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/DistUpgrade/DistUpgradeQuirks.py 2016-04-15 23:59:52.000000000 +0000 @@ -60,7 +60,7 @@ self.arch = get_arch() self.plugin_manager = PluginManager(self.controller, ["./plugins"]) self._poke = None - self._uid = os.environ['SUDO_UID'] + self._uid = '' self._user_env = {} # the quirk function have the name: @@ -407,26 +407,43 @@ if len(line): env = line.split('=', 1) self._user_env[env[0]] = env[1] - except: - logging.exception("failed to read user env") + 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: - idle = subprocess.Popen(["gnome-session-inhibit","--inhibit", - "idle", "--inhibit-only"], - env=self._user_env) + 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) - xdg_desktop = self._user_env["XDG_CURRENT_DESKTOP"].split(':') + # lock screen will be broken after upgrade (LP: #1565178) for desktop in xdg_desktop: if "GNOME" not in desktop: - atexit.register(idle.terminate); + atexit.register(idle.terminate) except: logging.exception("failed to inhibit gnome-session idle") os.seteuid(os.getuid()) diff -Nru ubuntu-release-upgrader-16.04.11/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-16.04.12/DistUpgrade/DistUpgradeVersion.py --- ubuntu-release-upgrader-16.04.11/DistUpgrade/DistUpgradeVersion.py 2016-04-14 21:50:38.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/DistUpgrade/DistUpgradeVersion.py 2016-04-16 00:09:01.000000000 +0000 @@ -1 +1 @@ -VERSION = '16.04.11' +VERSION = '16.04.12' diff -Nru ubuntu-release-upgrader-16.04.11/utils/demoted.cfg ubuntu-release-upgrader-16.04.12/utils/demoted.cfg --- ubuntu-release-upgrader-16.04.11/utils/demoted.cfg 2016-04-14 21:49:47.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/utils/demoted.cfg 2016-04-16 00:07:48.000000000 +0000 @@ -19,7 +19,6 @@ autoconf2.64 automake1.11 automoc -autopoint bacula bacula-client bacula-common @@ -96,17 +95,11 @@ dblatex dbus-test-runner debiandoc-sgml -default-jdk deja-dup-backend-gvfs dejagnu -device-tree-compiler dh-apparmor dh-apport -dh-autoreconf dh-buildinfo -dh-di -dh-exec -dh-golang dh-lua dh-migrations dh-modaliases @@ -335,7 +328,6 @@ kdelibs5-dbg kdelibs5-dev kdoctools -kernel-wedge keymapper konwert konwert-dev @@ -559,6 +551,7 @@ libcrypt-openssl-random-perl libcrypt-rijndael-perl libcss-minifier-xs-perl +libcuda1-340-updates libcuda1-352 libcuda1-352-updates libcunit1 @@ -773,6 +766,7 @@ libipc-run3-perl libipc-sharedcache-perl libipc-sharelite-perl +libirman-dev libisoburn-dbg libisoburn-dev libisoburn-doc @@ -1329,9 +1323,6 @@ munin-node munin-plugins-core munin-plugins-extra -mysql-client -mysql-common -mysql-server nant nasm naturaldocs @@ -1339,6 +1330,7 @@ ninja-build ninja-build-doc numlockx +nvidia-opencl-icd-340-updates nvidia-opencl-icd-352 nvidia-opencl-icd-352-updates ocaml diff -Nru ubuntu-release-upgrader-16.04.11/utils/demoted.cfg.trusty ubuntu-release-upgrader-16.04.12/utils/demoted.cfg.trusty --- ubuntu-release-upgrader-16.04.11/utils/demoted.cfg.trusty 2016-04-14 21:50:29.000000000 +0000 +++ ubuntu-release-upgrader-16.04.12/utils/demoted.cfg.trusty 2016-04-16 00:08:51.000000000 +0000 @@ -17,7 +17,6 @@ autoconf2.64 automake1.11 automoc -autopoint bacula bacula-client bacula-common @@ -94,16 +93,11 @@ dblatex dbus-test-runner debiandoc-sgml -default-jdk deja-dup-backend-gvfs dejagnu -device-tree-compiler dh-apparmor dh-apport -dh-autoreconf dh-buildinfo -dh-di -dh-exec dh-linktree dh-migrations dh-modaliases @@ -328,7 +322,6 @@ kdelibs5-dbg kdelibs5-dev kdoctools -kernel-wedge keymapper konwert konwert-dev @@ -720,6 +713,7 @@ libipc-run3-perl libipc-sharedcache-perl libipc-sharelite-perl +libirman-dev libisoburn-dbg libisoburn-dev libisoburn-doc @@ -1265,9 +1259,6 @@ munin-node munin-plugins-core munin-plugins-extra -mysql-client -mysql-common -mysql-server nant nasm naturaldocs