Merge lp:~brian-murray/ubuntu/oneiric/apport/debian-installer-hook into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

=== modified file 'data/package-hooks/source_debian-installer.py'
--- data/package-hooks/source_debian-installer.py	2009-08-25 11:10:59 +0000
+++ data/package-hooks/source_debian-installer.py	2011-08-04 19:03:31 +0000
@@ -1,9 +1,27 @@
 '''Apport package hook for the Debian installer.
 
-Copyright (C) 2009 Canonical Ltd.
-Author: Colin Watson <[e-mail]>'''
-
-from apport.hookutils import attach_hardware, command_available, command_output
+Copyright (C) 2011 Canonical Ltd.
+Authors: Colin Watson <[e-mail]>,
+         Brian Murray <[e-mail]>'''
+
+import os
+from apport.hookutils import attach_hardware, command_available, command_output, attach_root_command_outputs
+
+
+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:
+        return
+
+    if os.access(f, os.R_OK):
+        report[ident] = (f,)
+    else:
+        attach_root_command_outputs(report,
+            {ident: "cat '%s'" % f})
+
 
 def add_info(report):
     attach_hardware(report)
@@ -28,6 +46,10 @@
     except IOError:
         pass
 
+    add_installation_log(report, 'DIPartman', 'partman')
+    add_installation_log(report, 'DISyslog', 'syslog')
+
+
 if __name__ == '__main__':
     report = {}
     add_info(report)
 
=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py	2011-07-21 22:54:44 +0000
+++ data/package-hooks/source_ubiquity.py	2011-08-04 19:03:31 +0000
@@ -4,8 +4,9 @@
 Authors: Colin Watson <[e-mail]>,
          Brian Murray <[e-mail]>'''
 
+import apport.hookutils
 import os.path
-import apport.hookutils
+import re
 
 def add_installation_log(report, ident, name):
     if os.path.exists('/var/log/installer/%s' % name):
@@ -26,6 +27,18 @@
     if 'SQUASHFS error: Unable to read' in report['UbiquitySyslog']:
         ui.information("The system log from your installation contains an error.  The specific error commonly occurs when there is an issue with the media from which you were installing.  This can happen when your media is dirty or damaged or when you've burned the media at a high speed.  Please try cleaning the media and or burning new media at a lower speed.  In the event that you continue to encounter these errors it may be an issue with your CD / DVD drive.")
         raise StopIteration
+
+    match = re.search('ubiquity.*Ubiquity (.*)\n', report['UbiquitySyslog'])
+    if match:
+        match = match.group(1)
+    report.setdefault('Tags', '')
+    if match and 'oem-config' in match:
+        version = match.split()[0]
+        report['Tags'] += ' oem-config'
+    elif match:
+        version = match
+    report['Tags'] += ' ubiquity-%s' % version
+
     add_installation_log(report, 'UbiquityPartman', 'partman')
     if os.path.exists('/var/log/installer/debug'):
         response = ui.yesno("The debug log file from your installation would help us a lot but includes the password you used for your user when installing Ubuntu.  Do you want to include this log file?")
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-25 19:37:55 +0000
+++ debian/changelog	2011-08-04 19:03:31 +0000
@@ -1,3 +1,13 @@
+apport (1.21.2-0ubuntu10) oneiric; urgency=low
+
+  * data/package-hooks/source_debian-installer.py:
+    - collect installation log files (LP: #820582)
+  * data/package-hooks/source_ubiquity.py:
+    - tag bug reports using the version of ubiquity and oem-config if
+      applicable
+
+ -- Brian Murray <[e-mail]>  Thu, 04 Aug 2011 11:48:25 -0700
+
 apport (1.21.2-0ubuntu9) oneiric; urgency=low
 
   * data/package-hooks/source_linux.py: