Merge lp:~brian-murray/ubuntu/oneiric/plymouth/bug-787685 into lp:ubuntu/oneiric/plymouth

[Brian Murray]

Gather more information when reporting bugs via apport.

[Evan (ev)]

review: Approve

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-15 10:26:04 +0000
+++ debian/changelog	2011-07-19 17:08:41 +0000
@@ -1,3 +1,10 @@
+plymouth (0.8.2-2ubuntu25) oneiric; urgency=low
+
+  * debian/libplymouth2.apport: include grub configuration file and the
+    contents of /proc/cmdline when reporting a bug with apport (LP: #787685)
+
+ -- Brian Murray <[e-mail]>  Tue, 19 Jul 2011 09:57:35 -0700
+
 plymouth (0.8.2-2ubuntu24) oneiric; urgency=low
 
   * initramfs scripts: /dev/.initramfs/ → /run/initramfs transition.

=== modified file 'debian/libplymouth2.apport'
--- debian/libplymouth2.apport	2010-04-01 07:28:29 +0000
+++ debian/libplymouth2.apport	2011-07-19 17:08:41 +0000
@@ -1,13 +1,30 @@
 '''apport package hook for plymouth
 
 Copyright 2010 Canonical Ltd.
-Author: Steve Langasek <[e-mail]>
+Authors: Steve Langasek <[e-mail]>,
+         Brian Murray <[e-mail]>
 '''
 
 from apport.hookutils import *
 
+
+def _attach_file_filtered(report, path, key=None):
+    '''filter out password from grub configuration'''
+    if not key:
+        key = path_to_key(path)
+
+    if os.path.exists(path):
+        with open(path,'r') as f:
+            filtered = [l if not l.startswith('password')
+                        else '### PASSWORD LINE REMOVED ###'
+                        for l in f.readlines()]
+            report[key] = ''.join(filtered)
+
+
 def add_info(report):
 	attach_hardware(report)
 	attach_file(report,'/proc/fb','ProcFB')
+	attach_file(report, '/proc/cmdline','ProcCmdLine')
+	_attach_file_filtered(report, '/etc/default/grub','EtcDefaultGrub')
 	report['DefaultPlymouth'] = command_output(['readlink', '/etc/alternatives/default.plymouth'])
 	report['TextPlymouth'] = command_output(['readlink', '/etc/alternatives/text.plymouth'])