Merge lp:~brian-murray/ubuntu/oneiric/apport/ubiquity-tag-oem-config into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

Apparently oem-config doesn't always appear in the Ubiquity line with the version of ubiquity in '/var/log/installer/syslog' so a better check would be to use the existence of the OemConfigLog to determine whether or not to add the oem-config tag to a bug report.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py	2011-08-30 04:35:30 +0000
+++ data/package-hooks/source_ubiquity.py	2011-08-30 21:58:23 +0000
@@ -83,11 +83,8 @@
     if match:
         match = match.group(1)
     report.setdefault('Tags', '')
-    if match and 'oem-config' in match:
+    if match:
         report['Tags'] += ' ubiquity-%s' % match.split()[0]
-        report['Tags'] += ' oem-config'
-    elif match:
-        report['Tags'] += ' ubiquity-%s' % match
 
     add_installation_log(report, 'UbiquityPartman', 'partman')
     if os.path.exists('/var/log/installer/debug'):
@@ -99,3 +96,5 @@
     add_installation_log(report, 'UbiquityDm', 'dm')
     add_installation_log(report, 'Casper', 'casper.log')
     add_installation_log(report, 'OemConfigLog', 'oem-config.log')
+    if 'OemConfigLog' in report:
+        report['Tags'] += ' oem-config'

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-30 04:35:46 +0000
+++ debian/changelog	2011-08-30 21:58:23 +0000
@@ -1,3 +1,10 @@
+apport (1.22-0ubuntu4) oneiric; urgency=low
+
+  * data/package-hooks/source_ubiquity.py: Use attachment OemConfigLog to determine
+    whether or not to tag the bug oem-config not information in syslog
+
+ -- Brian Murray <[e-mail]>  Tue, 30 Aug 2011 13:09:14 -0700
+
 apport (1.22-0ubuntu3) oneiric; urgency=low
 
   * data/package-hooks/source_ubiquity.py: Fix crash on undefined 'version'.