Merge lp:~ev/apport/whoopsie into lp:~apport-hackers/apport/trunk

[Evan]

This fixes the issue apw raised in #ubuntu-devel, wherein apport is creating report files that are group owned by the affected user, rather than whoopsie.

[lp:~ev/apport/whoopsie]

2167. By Martin Pitt on 2012-02-23

launchpad.py: Fix crash on unicode report titles. (LP: #896626)

2168. By Martin Pitt on 2012-02-23

launchpad.py: typo fix

2169. By Martin Pitt on 2012-02-23

release 1.93

[Martin Pitt (pitti)]

Thanks!

review: Approve

[lp:~ev/apport/whoopsie]

2170. By Martin Pitt on 2012-02-23

apport: Set the group of written reports to "whoopsie" if that group exists.

=== modified file 'data/apport'
--- data/apport	2012-01-16 09:22:35 +0000
+++ data/apport	2012-02-23 14:59:17 +0000
@@ -13,7 +13,7 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-import sys, os, os.path, subprocess, time, traceback, tempfile, glob
+import sys, os, os.path, subprocess, time, traceback, tempfile, glob, pwd
 import signal, inspect, grp, fcntl
 
 import apport, apport.fileutils
@@ -346,7 +346,13 @@
         reportfile = os.fdopen(os.open(report,
             os.O_WRONLY|os.O_CREAT|os.O_EXCL, 0), 'w')
         assert reportfile.fileno() > sys.stderr.fileno()
-        os.chown(report, pidstat.st_uid, pidstat.st_gid)
+        whoopsie_gid = pwd.getpwnam('whoopsie')
+        if whoopsie_gid:
+            # Make sure the crash reporting daemon can read this report
+            whoopsie_gid = whoopsie_gid.pw_gid
+            os.chown(report, pidstat.st_uid, whoopsie_gid)
+        else:
+            os.chown(report, pidstat.st_uid, pidstat.st_gid)
     except (OSError, IOError) as e:
         error_log('Could not create report file: %s' % str(e))
         sys.exit(1)