summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-05-18 13:45:50 -0400
committerJoey Hess2014-05-18 13:45:50 -0400
commit79bc355adc30f02a72a7df0cfbcb178bf85c8432 (patch)
tree02e59754775e06f13b90c721031c31d0d7f33ed2
parent827140b87bc0c9f50c584d2be6036dd0ee6dcbfb (diff)
parent14c758970d8bfef64d8c166f471c603fbc72ea2b (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog6
-rw-r--r--src/Propellor/Property/Apt.hs2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 16ababc2..70d66e0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+propellor (0.5.3) UNRELEASED; urgency=medium
+
+ * Fix unattended-upgrades config for !stable.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 18 May 2014 13:44:00 -0400
+
propellor (0.5.2) unstable; urgency=medium
* A bug that caused propellor to hang when updating a running docker
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 7329c7a8..b673563d 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -213,7 +213,7 @@ unattendedUpgrades = RevertableProperty enable disable
| not (isStable suite) -> ensureProperty $
"/etc/apt/apt.conf.d/50unattended-upgrades"
`File.containsLine`
- ("\t\"o=Debian,a="++showSuite suite++"\";")
+ ("Unattended-Upgrade::Origins-Pattern { \"o=Debian,a="++suite++"\"; };")
_ -> noChange
-- | Preseeds debconf values and reconfigures the package so it takes