Merge lp:~brian-murray/unattended-upgrades/package-hook into lp:unattended-upgrades

[Brian Murray]

I've added in apport package hook for the unattended-upgrades package.

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-08 14:05:32 +0000
+++ debian/changelog	2014-04-09 20:24:17 +0000
@@ -1,10 +1,14 @@
 unattended-upgrades (0.82.6) unstable; urgency=medium
 
+  [ Michael Vogt ]
   * unattended-upgrades, test/test_rewind.py:
     - fix regression in rewind_cache() and add test (closes: 743594)
   * unattended-upgrade:
     - ensure minimal-upgrades-modes does not truncate dpkg output log
   
+  [ Brian Murray ]
+  * add in an apport package hook (LP: #1078386)
+
  -- Michael Vogt <[e-mail]>  Tue, 08 Apr 2014 16:05:23 +0200
 
 unattended-upgrades (0.82.5) unstable; urgency=low

=== added file 'debian/source_unattended-upgrades.py'
--- debian/source_unattended-upgrades.py	1970-01-01 00:00:00 +0000
+++ debian/source_unattended-upgrades.py	2014-04-09 20:24:17 +0000
@@ -0,0 +1,21 @@
+"""
+unattended-upgrades apport hook
+
+Collects the following log file:
+  - /var/log/unattended-upgrades/unattended-upgrades
+Check to see if either of these conffiles has been modified:
+  - /etc/apt/apt.conf.d/50unattended-upgrades
+  - /etc/apt/apt.conf.d/10periodic
+"""
+
+from apport.hookutils import (
+    attach_conffiles,
+    attach_file_if_exists)
+
+
+def add_info(report, ui):
+    # always attach these files
+    attach_conffiles(report, 'unattended-upgrades', ui=ui)
+    attach_conffiles(report, 'update-notifier-common', ui=ui)
+    attach_file_if_exists(report,
+                          '/var/log/unattended-upgrades/unattended-upgrades')

=== modified file 'setup.py'
--- setup.py	2013-09-12 20:20:14 +0000
+++ setup.py	2014-04-09 20:24:17 +0000
@@ -23,7 +23,9 @@
             ('../usr/share/man/man8/',
                 ["man/unattended-upgrade.8"]),
             ('../etc/pm/sleep.d/',
-                ["pm/sleep.d/10_unattended-upgrades-hibernate"])
+                ["pm/sleep.d/10_unattended-upgrades-hibernate"]),
+            ('../usr/share/apport/package-hooks/',
+                ["debian/source_unattended-upgrades.py"])
         ],
         cmdclass={"build": build_extra.build_extra,
                   "build_i18n":  build_i18n.build_i18n},