Merge lp:~vorlon/ubiquity/lp.947738 into lp:ubiquity

[Steve Langasek]

This may just be kicking the can down the road as far as bug #947738 is
concerned, since if 'sudo' fails in the target system, all kinds of things
are going to fail later on; but maybe the place for ubiquity to fail isn't
in the webcam plugin script?

[Evan (ev)]

Looks reasonable enough, especially considering we will never know exactly what happened in that bug. Sudo will complain loudly so I think the lack of logging an error in this case is okay.

review: Approve

[Colin Watson (cjwatson)]

Agreed. Though maybe in the future we should do the Python equivalent of 'chown --reference /home/user /home/user/.face' rather than mucking around with sudo.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-19 11:48:07 +0000
+++ debian/changelog	2012-04-20 03:03:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubiquity (2.10.15) precise-proposed; urgency=low
 
   * Fix crash when attempting to update the installer and a language isn't
@@ -6,6 +7,16 @@
 
  -- Colin Watson <[e-mail]>  Thu, 19 Apr 2012 12:44:17 +0100
 
+=======
+ubiquity (2.10.15) UNRELEASED; urgency=low
+
+  * If we can't figure out the target user's uid/gid, don't copy the photo
+    to the user's home directory.  Addresses the immediate symptom of bug
+    #947738, if not the root cause.
+
+ -- Steve Langasek <[e-mail]>  Thu, 19 Apr 2012 19:53:56 -0700
+
+>>>>>>> MERGE-SOURCE
 ubiquity (2.10.14) precise-proposed; urgency=low
 
   [ Colin Watson ]

=== modified file 'scripts/plugininstall.py'
--- scripts/plugininstall.py	2012-04-19 02:26:48 +0000
+++ scripts/plugininstall.py	2012-04-20 03:03:20 +0000
@@ -277,8 +277,11 @@
         gid = subprocess.Popen(['chroot', self.target, 'sudo', '-u',
             target_user, '--', 'id', '-g'], stdout=subprocess.PIPE)
         gid = gid.communicate()[0].strip('\n')
-        uid = int(uid)
-        gid = int(gid)
+        try:
+            uid = int(uid)
+            gid = int(gid)
+        except ValueError:
+            return
         if os.path.exists(PHOTO_PATH):
             targetpath = os.path.join(self.target, 'home', target_user, '.face')
             shutil.copy2(PHOTO_PATH, targetpath)