Merge lp:~didrocks/ubiquity/copy_wallpaper_cache into lp:ubiquity

[Didier Roche]

[Colin Watson (cjwatson)]

Just some minor comments; this mostly looks OK.

Typo: "ureadheaded" -> "ureadahead".

Please be consistent with the existing copy_network_config method in how you get the casper user's home directory. (If you wanted to move this to a common method in the process, that would be OK.)

You don't need those two unsightly backslash-continuations; line continuations are automatic within brackets of any kind.

There's no need to say 'return' at the end.

review: Needs Fixing

[Didier Roche (didrocks)]

Ok, needed changes has been done.

As told on IRC, I tried to factor the copy_network_config method (in fact, I tried already yesterday, but didn't push it further when I saw it didn't work), but we get 'root' as casper user in install mode (no SUDO_USER environment variable) and I need 'ubuntu' to access its wallpaper gconf key.

[Didier Roche (didrocks)]

Sorry, forgot to push resubmit proposal, see my previous comment :)

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-03 00:39:16 +0000
+++ debian/changelog	2010-03-03 10:29:18 +0000
@@ -36,7 +36,16 @@
   * Fix choose_partition thawing to handle free space at the end of
     update_partitions (LP: #527848).
 
+<<<<<<< TREE
  -- Evan Dandrea <[e-mail]>  Tue, 02 Mar 2010 21:11:41 +0000
+=======
+  [ Didier Roche ]
+  * scripts/install.py:
+   - copy the cached wallpaper created either by g-s-d or nautilus or by the
+     dedicated script in install mode. (LP: #530024)
+
+ -- Didier Roche <[e-mail]>  Mon, 01 Mar 2010 18:40:15 +0100
+>>>>>>> MERGE-SOURCE
 
 ubiquity (2.1.28) lucid; urgency=low
 

=== modified file 'scripts/install.py'
--- scripts/install.py	2010-02-24 16:38:40 +0000
+++ scripts/install.py	2010-03-03 10:29:18 +0000
@@ -427,7 +427,13 @@
                     'Could not create an Apparmor cache:')
                 for line in traceback.format_exc().split('\n'):
                     syslog.syslog(syslog.LOG_WARNING, line)
-
+            try:
+                self.copy_wallpaper_cache()
+            except:
+                syslog.syslog(syslog.LOG_WARNING,
+                    'Could not copy wallpaper cache:')                
+                for line in traceback.format_exc().split('\n'):
+                    syslog.syslog(syslog.LOG_WARNING, line)
             self.copy_dcd()
 
             self.db.progress('SET', self.count)
@@ -2358,6 +2364,43 @@
         install_misc.chrex(self.target,'umount', '/sys/kernel/security')
         install_misc.chrex(self.target,'umount', '/sys')
 
+    def copy_wallpaper_cache(self):
+        """Copy wallpaper cache for libgnome desktop so that it's taken into
+        account by ureadahead. Only install on system having g-s-d."""
+
+        # we don't use copy_network_config casper user trick as it's not and not
+        # ubuntu in install mode
+        casper_user = 'ubuntu'
+        casper_user_home = os.path.expanduser('~%s' % casper_user)
+        casper_user_wallpaper_cache_dir = os.path.join(casper_user_home,
+                                                       '.cache', 'wallpaper')
+        target_user = self.db.get('passwd/username')
+        target_user_cache_dir = os.path.join(self.target, 'home',
+                                                       target_user, '.cache')
+        target_user_wallpaper_cache_dir = os.path.join(target_user_cache_dir,
+                                                       'wallpaper')
+        if not os.path.isdir(target_user_wallpaper_cache_dir) and \
+               os.path.isfile('/usr/lib/gnome-settings-daemon/'
+                              'gnome-update-wallpaper-cache'):
+            # installer mode (else, g-s-d created it)
+            if not os.path.isdir(casper_user_wallpaper_cache_dir):
+                subprocess.call(['sudo', '-u', casper_user, '-i', 'DISPLAY=:0',
+                                 '/usr/lib/gnome-settings-daemon/'
+                                 'gnome-update-wallpaper-cache'])
+            # copy to targeted user
+            uid = subprocess.Popen(['chroot', self.target, 'sudo', '-u',
+                target_user, '--', 'id', '-u'],
+                stdout=subprocess.PIPE).communicate()[0].strip('\n')
+            gid = subprocess.Popen(['chroot', self.target, 'sudo', '-u',
+                target_user, '--', 'id', '-g'],
+                stdout=subprocess.PIPE).communicate()[0].strip('\n')
+            uid = int(uid)
+            gid = int(gid)
+            self.copy_tree(casper_user_wallpaper_cache_dir, 
+                           target_user_wallpaper_cache_dir, uid, gid)
+            os.chmod(target_user_cache_dir, 0700)
+            os.chmod(target_user_wallpaper_cache_dir, 0700)
+
     def cleanup(self):
         """Miscellaneous cleanup tasks."""