Merge lp:~xnox/ubiquity/fixup-owner-with-remove into lp:ubiquity

[Dimitri John Ledkov]

Remove dconf/user

[Colin Watson (cjwatson)]

Everything is terrible, but this is probably about the least bad option for now.

review: Approve

[lp:~xnox/ubiquity/fixup-owner-with-remove]

6635. By Dimitri John Ledkov on 2018-04-26

Remove dconf/user before Try Ubuntu. LP: #1767067
Just, in case it has the wrong permissions, i.e. root and thus breaks
user running gnome session / shell / "Try Ubuntu".

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-25 09:34:00 +0000
+++ debian/changelog	2018-04-26 14:03:14 +0000
@@ -1,3 +1,11 @@
+ubiquity (18.04.13) UNRELEASED; urgency=medium
+
+  * Remove dconf/user before Try Ubuntu. LP: #1767067
+    Just, in case it has the wrong permissions, i.e. root and thus breaks
+    user running gnome session / shell / "Try Ubuntu".
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 26 Apr 2018 06:58:02 -0700
+
 ubiquity (18.04.12) bionic; urgency=medium
 
   [ Didier Roche ]
 
=== modified file 'ubiquity/plugins/ubi-language.py'
--- ubiquity/plugins/ubi-language.py	2017-07-18 15:21:41 +0000
+++ ubiquity/plugins/ubi-language.py	2018-04-26 14:03:14 +0000
@@ -27,6 +27,7 @@
 
 from ubiquity import auto_update, i18n, misc, osextras, plugin
 
+import subprocess
 
 NAME = 'language'
 AFTER = None
@@ -135,6 +136,20 @@
             # The button's already been clicked once, so stop reacting to it.
             # LP: #911907.
             return
+        # Sometimes dconf/user ends up being written by root, despite being
+        # written to some user's XDG_RUNTIME_DIRECTORY later breaking
+        # gnome session/shell/starting desktop
+        # Thus log the permission of the file, and purge it, to ensure the
+        # session reliably starts
+        uid = os.environ.get('PKEXEC_UID', os.environ.get('SUDO_UID'))
+        if uid:
+            dconf_user = '/run/user/%s/dconf/user' % uid
+            if os.path.exists(dconf_user):
+                subprocess.run(['systemd-run', 'ls', '-latr', dconf_user])
+                try:
+                    os.remove(dconf_user)
+                except OSError:
+                    pass
         # Spinning cursor.
         self.controller.allow_change_step(False)
         # Queue quit.