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

[Brian Murray]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-26 03:03:23 +0000
+++ debian/changelog	2011-09-27 23:25:28 +0000
@@ -1,12 +1,17 @@
 plymouth (0.8.2-2ubuntu27) UNRELEASED; urgency=low
 
+  [ Steve Langasek ]
   * debian/plymouth.upstart: don't start up on 'stopped gdm' or 'stopped
     lightdm' since on upgrade one of these two will always be stopped at
     system boot.  Instead look for a 'desktop-shutdown' event, and declare
     appropriate Breaks: against earlier versions of gdm, lightdm, and lxdm
     that don't implement this event.  LP: #854329.
 
- -- Steve Langasek <[e-mail]>  Mon, 19 Sep 2011 17:41:38 -0700
+  [ Brian Murray ]
+  * debian/libplymouth2.apport: collect boot.log and plymouth-debug.log if it
+    exists (LP: #860371)
+
+ -- Brian Murray <[e-mail]>  Tue, 27 Sep 2011 16:18:10 -0700
 
 plymouth (0.8.2-2ubuntu26) oneiric; urgency=low
 

=== modified file 'debian/libplymouth2.apport'
--- debian/libplymouth2.apport	2011-07-19 17:00:03 +0000
+++ debian/libplymouth2.apport	2011-09-27 23:25:28 +0000
@@ -7,6 +7,8 @@
 
 from apport.hookutils import *
 
+import os.path
+
 
 def _attach_file_filtered(report, path, key=None):
     '''filter out password from grub configuration'''
@@ -22,9 +24,14 @@
 
 
 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'])
+    attach_hardware(report)
+    attach_file(report, '/proc/fb', 'ProcFB')
+    attach_file(report, '/proc/cmdline', 'ProcCmdLine')
+    attach_file(report, '/var/log/boot.log', 'BootLog')
+    debug_log = '/var/log/plymouth-debug.log'
+    if os.path.exists(debug_log):
+        attach_root_command_outputs(report,
+            {'PlymouthDebug': 'cat %s' % debug_log})
+    _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'])