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

Proposed by Brian Murray on 2011-09-27
Status: Merged
Merged at revision: 1408
Proposed branch: lp:~brian-murray/ubuntu/oneiric/plymouth/bug-860371
Merge into: lp:ubuntu/oneiric/plymouth
Diff against target: 56 lines (+19/-7)
2 files modified
debian/changelog (+6/-1)
debian/libplymouth2.apport (+13/-6)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/plymouth/bug-860371
Reviewer Review Type Date Requested Status
Martin Pitt 2011-09-28 Approve on 2011-09-28
Steve Langasek 2011-09-27 Pending
Review via email: mp+77252@code.launchpad.net
To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-26 03:03:23 +0000
3+++ debian/changelog 2011-09-27 23:25:28 +0000
4@@ -1,12 +1,17 @@
5 plymouth (0.8.2-2ubuntu27) UNRELEASED; urgency=low
6
7+ [ Steve Langasek ]
8 * debian/plymouth.upstart: don't start up on 'stopped gdm' or 'stopped
9 lightdm' since on upgrade one of these two will always be stopped at
10 system boot. Instead look for a 'desktop-shutdown' event, and declare
11 appropriate Breaks: against earlier versions of gdm, lightdm, and lxdm
12 that don't implement this event. LP: #854329.
13
14- -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 19 Sep 2011 17:41:38 -0700
15+ [ Brian Murray ]
16+ * debian/libplymouth2.apport: collect boot.log and plymouth-debug.log if it
17+ exists (LP: #860371)
18+
19+ -- Brian Murray <brian@ubuntu.com> Tue, 27 Sep 2011 16:18:10 -0700
20
21 plymouth (0.8.2-2ubuntu26) oneiric; urgency=low
22
23
24=== modified file 'debian/libplymouth2.apport'
25--- debian/libplymouth2.apport 2011-07-19 17:00:03 +0000
26+++ debian/libplymouth2.apport 2011-09-27 23:25:28 +0000
27@@ -7,6 +7,8 @@
28
29 from apport.hookutils import *
30
31+import os.path
32+
33
34 def _attach_file_filtered(report, path, key=None):
35 '''filter out password from grub configuration'''
36@@ -22,9 +24,14 @@
37
38
39 def add_info(report):
40- attach_hardware(report)
41- attach_file(report,'/proc/fb','ProcFB')
42- attach_file(report, '/proc/cmdline','ProcCmdLine')
43- _attach_file_filtered(report, '/etc/default/grub','EtcDefaultGrub')
44- report['DefaultPlymouth'] = command_output(['readlink', '/etc/alternatives/default.plymouth'])
45- report['TextPlymouth'] = command_output(['readlink', '/etc/alternatives/text.plymouth'])
46+ attach_hardware(report)
47+ attach_file(report, '/proc/fb', 'ProcFB')
48+ attach_file(report, '/proc/cmdline', 'ProcCmdLine')
49+ attach_file(report, '/var/log/boot.log', 'BootLog')
50+ debug_log = '/var/log/plymouth-debug.log'
51+ if os.path.exists(debug_log):
52+ attach_root_command_outputs(report,
53+ {'PlymouthDebug': 'cat %s' % debug_log})
54+ _attach_file_filtered(report, '/etc/default/grub', 'EtcDefaultGrub')
55+ report['DefaultPlymouth'] = command_output(['readlink', '/etc/alternatives/default.plymouth'])
56+ report['TextPlymouth'] = command_output(['readlink', '/etc/alternatives/text.plymouth'])

Subscribers

People subscribed via source and target branches

to all changes: