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

[Dimitri John Ledkov]

[Martin Pitt (pitti)]

LGTM, please go ahead.

review: Approve

=== 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 @@
 
 
 def add_installation_log(report, ident, name):
-    if os.path.exists('/var/log/installer/%s' % name):
-        f = '/var/log/installer/%s' % name
-    elif os.path.exists('/var/log/%s' % name):
-        f = '/var/log/%s' % name
-    else:
+    f = False
+    for try_location in ('/var/log/installer/%s',
+                         '/var/log/%s',
+                         '/var/log/upstart/%s'):
+        if os.path.exists(try_location % name):
+            f = try_location % name
+            break
+    if not f:
         return
 
     if os.access(f, os.R_OK):
@@ -119,6 +122,7 @@
         if response:
             add_installation_log(report, 'UbiquityDebug', 'debug')
     add_installation_log(report, 'UbiquityDm', 'dm')
+    add_installation_log(report, 'UpstartUbiquity', 'ubiquity.log')    
     add_installation_log(report, 'Casper', 'casper.log')
     add_installation_log(report, 'OemConfigLog', 'oem-config.log')
     if 'OemConfigLog' in report:

=== 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 @@
+apport (2.9.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Include ubiquity.log generated by upstart for the ubiquity.conf
+    upstart job.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 13 Mar 2013 18:52:21 +0000
+
 apport (2.9.1-0ubuntu1) raring; urgency=low
 
   * New upstream release: