From dcf6b88f4638d91d01005b819e92cc4ffccb5f46 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 May 2014 14:18:31 -0400 Subject: [PATCH] really fix use of suite --- config-joey.hs | 4 ++-- src/Propellor/Property/Apt.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index 9278808..4580589 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 b673563..d3f47a8 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