summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-06-05 16:52:41 -0400
committerJoey Hess2014-06-05 16:52:41 -0400
commitdbffd982bac47cebd3fc67e51b46182f7e43392d (patch)
tree8a89dfc858b449a21980962415c2dbdb50416dba /src
parenta2db41b4e8b6ef79f9db2a78b936e4c5e1d6f928 (diff)
fix os attribute
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Apt.hs7
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs4
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index f5dd74b5..69144d72 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -214,12 +214,7 @@ unattendedUpgrades = RevertableProperty enable disable
"/etc/apt/apt.conf.d/50unattended-upgrades"
`File.containsLine`
("Unattended-Upgrade::Origins-Pattern { \"o=Debian,a="++showSuite suite++"\"; };")
- | otherwise -> do
- liftIO $ print ("xxx ", suite)
- noChange
- _ -> do
- liftIO $ print "xxx"
- noChange
+ _ -> noChange
-- | Preseeds debconf values and reconfigures the package so it takes
-- effect.
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 2f467669..6e4ca81a 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -99,6 +99,7 @@ cabalDeps = flagFile go cabalupdated
standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int -> TimeOut -> Host
standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder")
(dockerImage $ System (Debian Unstable) arch)
+ & os (System (Debian Unstable) arch)
& Apt.stdSourcesList Unstable
& Apt.installed ["systemd"]
& Apt.unattendedUpgrades
@@ -116,6 +117,7 @@ androidAutoBuilderContainer dockerImage crontimes timeout =
androidContainer :: (System -> Docker.Image) -> Docker.ContainerName -> Property -> FilePath -> Host
androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.container name
(dockerImage $ System (Debian Stable) "i386")
+ & os (System (Debian Stable) "i386")
& Apt.stdSourcesList Stable
& Apt.installed ["systemd"]
& User.accountFor builduser
@@ -142,6 +144,7 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe
armelCompanionContainer :: (System -> Docker.Image) -> Host
armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion"
(dockerImage $ System (Debian Unstable) "amd64")
+ & os (System (Debian Unstable) "amd64")
& Apt.stdSourcesList Unstable
& Apt.installed ["systemd"]
& Apt.unattendedUpgrades
@@ -159,6 +162,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
armelAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "armel-git-annex-builder"
(dockerImage $ System (Debian Unstable) "armel")
+ & os (System (Debian Unstable) "armel")
& Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades
& Apt.installed ["systemd"]