summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-05-18 14:18:31 -0400
committerJoey Hess2014-05-18 14:18:31 -0400
commitdcf6b88f4638d91d01005b819e92cc4ffccb5f46 (patch)
treee09b2fa89e3ed1d4cdc5989091a4732f16bc47bb
parent14c758970d8bfef64d8c166f471c603fbc72ea2b (diff)
really fix use of suite
-rw-r--r--config-joey.hs4
-rw-r--r--src/Propellor/Property/Apt.hs2
2 files changed, 3 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 9278808c..45805897 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -94,8 +94,8 @@ hosts = -- (o) `
& Docker.configured
& Docker.docked hosts "amd64-git-annex-builder"
& Docker.docked hosts "i386-git-annex-builder"
- ! Docker.docked hosts "armel-git-annex-builder-companion"
- ! Docker.docked hosts "armel-git-annex-builder"
+ & Docker.docked hosts "armel-git-annex-builder-companion"
+ & Docker.docked hosts "armel-git-annex-builder"
& Docker.garbageCollected `period` Daily
& Apt.buildDep ["git-annex"] `period` Daily
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index b673563d..d3f47a80 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`
- ("Unattended-Upgrade::Origins-Pattern { \"o=Debian,a="++suite++"\"; };")
+ ("Unattended-Upgrade::Origins-Pattern { \"o=Debian,a="++showSuite suite++"\"; };")
_ -> noChange
-- | Preseeds debconf values and reconfigures the package so it takes