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

Proposed by Brian Murray
Status: Merged
Merged at revision: 306
Proposed branch: lp:~brian-murray/unattended-upgrades/package-hook
Merge into: lp:unattended-upgrades
Diff against target: 59 lines (+28/-1)
3 files modified
debian/changelog (+4/-0)
debian/source_unattended-upgrades.py (+21/-0)
setup.py (+3/-1)
To merge this branch: bzr merge lp:~brian-murray/unattended-upgrades/package-hook
Reviewer Review Type Date Requested Status
Michael Vogt Pending
unattended-upgrades-developers Pending
Review via email: mp+215032@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1unattended-upgrades (0.82.6) unstable; urgency=medium1unattended-upgrades (0.82.6) unstable; urgency=medium
22
3 [ Michael Vogt ]
3 * unattended-upgrades, test/test_rewind.py:4 * unattended-upgrades, test/test_rewind.py:
4 - fix regression in rewind_cache() and add test (closes: 743594)5 - fix regression in rewind_cache() and add test (closes: 743594)
5 * unattended-upgrade:6 * unattended-upgrade:
6 - ensure minimal-upgrades-modes does not truncate dpkg output log7 - ensure minimal-upgrades-modes does not truncate dpkg output log
7 8
9 [ Brian Murray ]
10 * add in an apport package hook (LP: #1078386)
11
8 -- Michael Vogt <mvo@debian.org> Tue, 08 Apr 2014 16:05:23 +020012 -- Michael Vogt <mvo@debian.org> Tue, 08 Apr 2014 16:05:23 +0200
913
10unattended-upgrades (0.82.5) unstable; urgency=low14unattended-upgrades (0.82.5) unstable; urgency=low
1115
=== 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 @@
1"""
2unattended-upgrades apport hook
3
4Collects the following log file:
5 - /var/log/unattended-upgrades/unattended-upgrades
6Check to see if either of these conffiles has been modified:
7 - /etc/apt/apt.conf.d/50unattended-upgrades
8 - /etc/apt/apt.conf.d/10periodic
9"""
10
11from apport.hookutils import (
12 attach_conffiles,
13 attach_file_if_exists)
14
15
16def add_info(report, ui):
17 # always attach these files
18 attach_conffiles(report, 'unattended-upgrades', ui=ui)
19 attach_conffiles(report, 'update-notifier-common', ui=ui)
20 attach_file_if_exists(report,
21 '/var/log/unattended-upgrades/unattended-upgrades')
022
=== 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 @@
23 ('../usr/share/man/man8/',23 ('../usr/share/man/man8/',
24 ["man/unattended-upgrade.8"]),24 ["man/unattended-upgrade.8"]),
25 ('../etc/pm/sleep.d/',25 ('../etc/pm/sleep.d/',
26 ["pm/sleep.d/10_unattended-upgrades-hibernate"])26 ["pm/sleep.d/10_unattended-upgrades-hibernate"]),
27 ('../usr/share/apport/package-hooks/',
28 ["debian/source_unattended-upgrades.py"])
27 ],29 ],
28 cmdclass={"build": build_extra.build_extra,30 cmdclass={"build": build_extra.build_extra,
29 "build_i18n": build_i18n.build_i18n},31 "build_i18n": build_i18n.build_i18n},

Subscribers

People subscribed via source and target branches