Merge lp:~brian-murray/ubuntu/oneiric/apport/ubiquity-and-overrides into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

[Martin Pitt (pitti)]

Committed with a few small code cleanups, thanks!

review: Approve

=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2011-07-20 16:34:35 +0000
+++ apport/hookutils.py	2011-07-22 14:10:55 +0000
@@ -100,7 +100,8 @@
         # conffiles
         path, default_md5sum = line.strip().split()[:2]
 
-        if conffiles and path not in conffiles: continue
+        if conffiles and path not in conffiles:
+            continue
 
         key = 'modified.conffile.' + path_to_key(path)
 
@@ -126,6 +127,33 @@
         else:
             report[key] = '[deleted]'
 
+
+def attach_upstart_overrides(report, package):
+    '''Attach information about any Upstart override files'''
+
+    try:
+       dpkg = subprocess.Popen(['dpkg-query','-W','--showformat=${Conffiles}',
+           package], stdout=subprocess.PIPE, close_fds=True)
+    except OSError, e:
+        return 'Error: ' + str(e)
+
+    out = dpkg.communicate()[0]
+    if dpkg.returncode != 0:
+        return
+
+    for line in out.splitlines():
+        if not line:
+            continue
+        conffile = line.strip().split()[0]
+
+        if os.path.exists(conffile) and '/etc/init/' in conffile:
+            override = conffile.replace('.conf', '.override')
+            title = override.replace('/etc/init/', '')
+            if os.path.exists(override):
+                contents = open(override).read()
+                report[title] = contents
+
+
 def attach_dmesg(report):
     '''Attach information from the kernel ring buffer (dmesg).
 

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-07-22 13:34:03 +0000
+++ data/general-hooks/ubuntu.py	2011-07-22 14:10:55 +0000
@@ -60,13 +60,19 @@
 
     if 'Package' in report:
         package = report['Package'].split()[0]
-        if package and 'attach_conffiles' in dir():
-            attach_conffiles(report, package, ui)
+        if package:
+            attach_conffiles(report, package, ui=ui)
 
         # do not file bugs against "upgrade-system" if it is not installed (LP#404727)
         if package == 'upgrade-system' and 'not installed' in report['Package']:
             report['UnreportableReason'] = 'You do not have the upgrade-system package installed. Please report package upgrade failures against the package that failed to install, or against upgrade-manager.'
 
+    problemtype = report.get('ProblemType', '')
+    if problemtype in ['Bug', 'Package', 'Crash']:
+        package = report['Package'].split()[0]
+        if package:
+            attach_upstart_overrides(report, package)
+
     # running Unity?
     username = pwd.getpwuid(os.geteuid()).pw_name
     if subprocess.call(['killall', '-s0', '-u', username,

=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py	2011-07-07 21:05:32 +0000
+++ data/package-hooks/source_ubiquity.py	2011-07-22 14:10:55 +0000
@@ -33,8 +33,6 @@
             raise StopIteration
         if response:
             add_installation_log(report, 'UbiquityDebug', 'debug')
-    if os.path.exists('/var/log/installer/dm'):
-        report['UbiquityDm'] = ('/var/log/installer/dm',)
+    add_installation_log(report, 'UbiquityDm', 'dm')
     add_installation_log(report, 'Casper', 'casper.log')
-    if os.path.exists('/var/log/oem-config.log'):
-        report['OemConfigLog'] = ('/var/log/oem-config.log',)
+    add_installation_log(report, 'OemConfigLog', 'oem-config.log')

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-22 13:34:03 +0000
+++ debian/changelog	2011-07-22 14:10:55 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 apport (1.21.2-0ubuntu7) UNRELEASED; urgency=low
 
   * data/general-hooks/ubuntu.py: Fix calling of add_info() in the __main__
@@ -5,6 +6,19 @@
 
  -- Martin Pitt <[e-mail]>  Fri, 22 Jul 2011 15:33:45 +0200
 
+=======
+apport (1.21.2-0ubuntu7) oneiric; urgency=low
+
+  * data/package-hooks/source_ubiquity.py:
+    - collect all logs using root_command_outputs (LP: #812738)
+  * apport/hookutils.py:
+    - check to see if the package has any upstart override files
+  * data/general-hooks/ubuntu.py:
+    - when reporting a problem use the upstart override check (LP: #803977)
+
+ -- Brian Murray <[e-mail]>  Thu, 21 Jul 2011 14:41:54 -0700
+
+>>>>>>> MERGE-SOURCE
 apport (1.21.2-0ubuntu6) oneiric; urgency=low
 
   * data/general-hooks/ubuntu.py: