Merge lp:~canonical-platform-qa/ubiquity/no-gtk-modules into lp:ubiquity

[Max Brustkern]

Removed other references to deprecated GTK_MODULES

This branch removes references to the GTK_MODULES environment variable which was recently removed.

[Dimitri John Ledkov (xnox)]

review: Needs Fixing

[lp:~canonical-platform-qa/ubiquity/no-gtk-modules]

6502. By Max Brustkern on 2016-12-20

Adding GTK_MODULES to environment if it doesn't exist

[Max Brustkern (nuclearbob)]

Thanks for the feedback! Please let me know if this looks better.

[Iain Lane (laney)]

xnox, please re-review.

I just looked into this same bug, found the solution, then found this MP. It's now linked to the bug (which was filed later than the MP).

This bug breaks the try / install menu in maybe-ubiquity mode, so please upload. I made a couple of small comments that IMHO you could fix directly after merging if you want.

[Mathieu Trudel-Lapierre (cyphermox)]

There is still the extra character, but I'm happy with how the code is; I'll merge this.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2016-12-02 14:58:25 +0000
+++ bin/ubiquity-dm	2016-12-20 20:04:42 +0000
@@ -410,6 +410,7 @@
                 stdin=null, stdout=logfile, stderr=logfile,
                 preexec_fn=self.drop_privileges))
 
+↓
         # Accessibility infrastructure
         proc_cmdline = []
         with open('/proc/cmdline', 'r') as fp:
@@ -547,7 +548,10 @@
                         [launcher, '--launch-immediately'],
                         stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges))
-                    os.environ['GTK_MODULES'] += os.pathsep + 'gail'
+                    if 'GTK_MODULES' in os.environ:
+                        os.environ['GTK_MODULES'] += os.pathsep + 'gail'
+                    else:
+                        os.environ['GTK_MODULES'] = 'gail'
 
             if osextras.find_on_path('gnome-shell'):
                 wm_cmd = ['gnome-shell', '--sm-disable', '--mode=ubiquity']

=== modified file 'bin/ubiquity-wrapper'
--- bin/ubiquity-wrapper	2016-12-02 14:58:25 +0000
+++ bin/ubiquity-wrapper	2016-12-20 20:04:42 +0000
@@ -23,7 +23,10 @@
         if not sys.argv[i].startswith('-'):
             frontend = sys.argv[i]
         elif sys.argv[i] == '--autopilot':
-            os.environ['GTK_MODULES'] += os.pathsep + 'autopilot'
+            if 'GTK_MODULES' in os.environ:
+                os.environ['GTK_MODULES'] += os.pathsep + 'autopilot'
+            else:
+                os.environ['GTK_MODULES'] = 'autopilot'
         newargv.append(sys.argv[i])
         i += 1