Merge lp:~xnox/ubuntu/raring/apport/ubuntu into lp:~ubuntu-core-dev/ubuntu/raring/apport/ubuntu

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Martin Pitt
Approved revision: 2165
Merged at revision: 2168
Proposed branch: lp:~xnox/ubuntu/raring/apport/ubuntu
Merge into: lp:~ubuntu-core-dev/ubuntu/raring/apport/ubuntu
Diff against target: 46 lines (+16/-5)
2 files modified
data/package-hooks/source_ubiquity.py (+9/-5)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~xnox/ubuntu/raring/apport/ubuntu
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+153224@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

LGTM, please go ahead.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py 2013-02-19 00:39:55 +0000
+++ data/package-hooks/source_ubiquity.py 2013-03-13 18:55:30 +0000
@@ -10,11 +10,14 @@
1010
1111
12def add_installation_log(report, ident, name):12def add_installation_log(report, ident, name):
13 if os.path.exists('/var/log/installer/%s' % name):13 f = False
14 f = '/var/log/installer/%s' % name14 for try_location in ('/var/log/installer/%s',
15 elif os.path.exists('/var/log/%s' % name):15 '/var/log/%s',
16 f = '/var/log/%s' % name16 '/var/log/upstart/%s'):
17 else:17 if os.path.exists(try_location % name):
18 f = try_location % name
19 break
20 if not f:
18 return21 return
1922
20 if os.access(f, os.R_OK):23 if os.access(f, os.R_OK):
@@ -119,6 +122,7 @@
119 if response:122 if response:
120 add_installation_log(report, 'UbiquityDebug', 'debug')123 add_installation_log(report, 'UbiquityDebug', 'debug')
121 add_installation_log(report, 'UbiquityDm', 'dm')124 add_installation_log(report, 'UbiquityDm', 'dm')
125 add_installation_log(report, 'UpstartUbiquity', 'ubiquity.log')
122 add_installation_log(report, 'Casper', 'casper.log')126 add_installation_log(report, 'Casper', 'casper.log')
123 add_installation_log(report, 'OemConfigLog', 'oem-config.log')127 add_installation_log(report, 'OemConfigLog', 'oem-config.log')
124 if 'OemConfigLog' in report:128 if 'OemConfigLog' in report:
125129
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-07 15:04:39 +0000
+++ debian/changelog 2013-03-13 18:55:30 +0000
@@ -1,3 +1,10 @@
1apport (2.9.1-0ubuntu2) UNRELEASED; urgency=low
2
3 * Include ubiquity.log generated by upstart for the ubiquity.conf
4 upstart job.
5
6 -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Wed, 13 Mar 2013 18:52:21 +0000
7
1apport (2.9.1-0ubuntu1) raring; urgency=low8apport (2.9.1-0ubuntu1) raring; urgency=low
29
3 * New upstream release:10 * New upstream release:

Subscribers

People subscribed via source and target branches