Merge lp:~stgraber/ubiquity/ubiquity-dconf into lp:ubiquity

[Stéphane Graber]

11:38 < stgraber> cjwatson: I'm really not too happy about my last gsettings change (running in dbus-launch), we end up with ~10-15 dbus-daemon + dbus-launch running at the end
                  of the install
11:38 < stgraber> each of them with their own dconf-writer running, even though that "works" (AFAICT), I feel like I need to clean that up a little
11:39 < cjwatson> where was that change?
11:40 < stgraber> I think the root of the gsettings issue is that dconf-writer doesn't get killed properly and so doesn't dump its changes to disk, instead I think we should try
                  to spawn it from ubiquity-dm (maybe inside a dbus-launch call if that's what it needs) and kill that when ubiquity-dm exits
11:40 < stgraber> cjwatson: r5356 in ubiquity/gsettings.py
11:40 < stgraber> essentially a workaround for bug 960096
11:41 < ubot2> Launchpad bug 960096 in libxklavier "Live session started with wrong layout" [Medium,Confirmed] https://launchpad.net/bugs/960096
11:42 < cjwatson> do you think it's RC? I agree it's not particularly elegant, but ...
11:43 < cjwatson> maybe a branch staged for Q
11:43 < stgraber> yeah, I haven't seen any report of it blowing up, though I can't see how 10 dconf-writer running and writing to the same binary DB could be a good thing

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2012-04-02 14:54:39 +0000
+++ bin/ubiquity-dm	2012-04-19 12:05:23 +0000
@@ -155,6 +155,7 @@
         signal.signal(signal.SIGUSR1, signal.SIG_IGN)
 
     def run(self, *program):
+        extras = []
         null = open('/dev/null', 'w')
         try:
             os.makedirs('/var/log/installer')
@@ -280,6 +281,13 @@
             dbus_subp.stdout.close()
             dbus_subp.wait()
 
+        # dconf writer
+        if os.path.exists("/usr/lib/dconf/dconf-service"):
+            extras.append(subprocess.Popen(
+                ['/usr/lib/dconf/dconf-service'],
+                stdin=null, stdout=logfile, stderr=logfile,
+                preexec_fn=self.drop_privileges))
+
         gconfd_running = False
         if (self.frontend == 'gtk_ui' and
             osextras.find_on_path('gconftool-2')):
@@ -288,7 +296,6 @@
                             preexec_fn=self.drop_privileges)
             gconfd_running = True
 
-        extras = []
         if self.frontend == 'gtk_ui':
             gconf_dir = ('xml:readwrite:%s' %
                 os.path.expanduser('~%s/.gconf' %

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-19 11:48:07 +0000
+++ debian/changelog	2012-04-19 12:05:23 +0000
@@ -1,10 +1,20 @@
 ubiquity (2.10.15) precise-proposed; urgency=low
 
+  [ Colin Watson ]
   * Fix crash when attempting to update the installer and a language isn't
     selected for some reason (LP: #985368).
   * Automatic update of included source packages: partman-target 77ubuntu2.
 
+<<<<<<< TREE
  -- Colin Watson <[e-mail]>  Thu, 19 Apr 2012 12:44:17 +0100
+=======
+  [ Stéphane Graber ]
+  * Spawn dconf-service from ubiquity-dm and drop all the dbus-launch calls.
+    This should ensure we have a single dconf-service running and that gets
+    killed on ubiquity's exit.
+
+ -- Stéphane Graber <[e-mail]>  Thu, 19 Apr 2012 14:02:28 +0200
+>>>>>>> MERGE-SOURCE
 
 ubiquity (2.10.14) precise-proposed; urgency=low
 

=== modified file 'ubiquity/gsettings.py'
--- ubiquity/gsettings.py	2012-04-04 22:16:32 +0000
+++ ubiquity/gsettings.py	2012-04-19 12:05:23 +0000
@@ -44,7 +44,7 @@
     if not user:
         user = os.getenv("SUDO_USER", os.getenv("USER", "root"))
 
-    subp = subprocess.Popen(['sudo', '-u', user, 'dbus-launch', 'gsettings', 'get', schema, key],
+    subp = subprocess.Popen(['sudo', '-u', user, 'gsettings', 'get', schema, key],
                             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                             preexec_fn=misc.drop_all_privileges)
     value = subp.communicate()[0].rstrip('\n')
@@ -98,7 +98,7 @@
     if value == True:
         value = "true"
 
-    subprocess.call(['sudo', '-u', user, 'dbus-launch', 'gsettings', 'set', schema, key, str(value)],
+    subprocess.call(['sudo', '-u', user, 'gsettings', 'set', schema, key, str(value)],
                      preexec_fn=misc.drop_all_privileges)
 
 def set_list(schema, key, values, user = None):
@@ -115,5 +115,5 @@
     if not user:
         user = os.getenv("SUDO_USER", os.getenv("USER", "root"))
 
-    subprocess.call(['sudo', '-u', user, 'dbus-launch', 'gsettings', 'reset', schema, key],
+    subprocess.call(['sudo', '-u', user, 'gsettings', 'reset', schema, key],
                      preexec_fn=misc.drop_all_privileges)