summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--src/Propellor/Property/Apt.hs2
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2f2a74a8..59a4296d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ propellor (2.15.4) UNRELEASED; urgency=medium
Thanks, Sean Whitton.
* Obnam: To cause old generations to be forgotten, keepParam can be
passed to a backup property; this causes obnam forget to be run.
+ * Delete /etc/apt/apt.conf.d/50unattended-upgrades.ucf-dist when
+ unattended-upgrades is installed, to work around #812380 which results
+ in many warnings from apt, including in cron mails.
-- Joey Hess <id@joeyh.name> Mon, 18 Jan 2016 13:15:30 -0400
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index d16c4855..f5d08c1d 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -223,6 +223,8 @@ unattendedUpgrades = enable <!> disable
enable = setup True
`before` Service.running "cron"
`before` configure
+ -- work around http://bugs.debian.org/812380
+ `before` File.notPresent "/etc/apt/apt.conf.d/50unattended-upgrades.ucf-dist"
disable = setup False
setup enabled = (if enabled then installed else removed) ["unattended-upgrades"]