Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-05-18 13:45:50 -04:00
commit 79bc355adc
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -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

View File

@ -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