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
=== 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 @@
1plymouth (0.8.2-2ubuntu27) UNRELEASED; urgency=low1plymouth (0.8.2-2ubuntu27) UNRELEASED; urgency=low
22
3 [ Steve Langasek ]
3 * debian/plymouth.upstart: don't start up on 'stopped gdm' or 'stopped4 * debian/plymouth.upstart: don't start up on 'stopped gdm' or 'stopped
4 lightdm' since on upgrade one of these two will always be stopped at5 lightdm' since on upgrade one of these two will always be stopped at
5 system boot. Instead look for a 'desktop-shutdown' event, and declare6 system boot. Instead look for a 'desktop-shutdown' event, and declare
6 appropriate Breaks: against earlier versions of gdm, lightdm, and lxdm7 appropriate Breaks: against earlier versions of gdm, lightdm, and lxdm
7 that don't implement this event. LP: #854329.8 that don't implement this event. LP: #854329.
89
9 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 19 Sep 2011 17:41:38 -070010 [ Brian Murray ]
11 * debian/libplymouth2.apport: collect boot.log and plymouth-debug.log if it
12 exists (LP: #860371)
13
14 -- Brian Murray <brian@ubuntu.com> Tue, 27 Sep 2011 16:18:10 -0700
1015
11plymouth (0.8.2-2ubuntu26) oneiric; urgency=low16plymouth (0.8.2-2ubuntu26) oneiric; urgency=low
1217
1318
=== 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 @@
77
8from apport.hookutils import *8from apport.hookutils import *
99
10import os.path
11
1012
11def _attach_file_filtered(report, path, key=None):13def _attach_file_filtered(report, path, key=None):
12 '''filter out password from grub configuration'''14 '''filter out password from grub configuration'''
@@ -22,9 +24,14 @@
2224
2325
24def add_info(report):26def add_info(report):
25 attach_hardware(report)27 attach_hardware(report)
26 attach_file(report,'/proc/fb','ProcFB')28 attach_file(report, '/proc/fb', 'ProcFB')
27 attach_file(report, '/proc/cmdline','ProcCmdLine')29 attach_file(report, '/proc/cmdline', 'ProcCmdLine')
28 _attach_file_filtered(report, '/etc/default/grub','EtcDefaultGrub')30 attach_file(report, '/var/log/boot.log', 'BootLog')
29 report['DefaultPlymouth'] = command_output(['readlink', '/etc/alternatives/default.plymouth'])31 debug_log = '/var/log/plymouth-debug.log'
30 report['TextPlymouth'] = command_output(['readlink', '/etc/alternatives/text.plymouth'])32 if os.path.exists(debug_log):
33 attach_root_command_outputs(report,
34 {'PlymouthDebug': 'cat %s' % debug_log})
35 _attach_file_filtered(report, '/etc/default/grub', 'EtcDefaultGrub')
36 report['DefaultPlymouth'] = command_output(['readlink', '/etc/alternatives/default.plymouth'])
37 report['TextPlymouth'] = command_output(['readlink', '/etc/alternatives/text.plymouth'])

Subscribers

People subscribed via source and target branches

to all changes: