summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Engine.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index b4dc66ce..62209bc4 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -102,7 +102,7 @@ onlyProcess lockfile a = bracket lock unlock (const a)
`catchIO` const alreadyrunning
return l
unlock = closeFd
- alreadyrunning = error "Propellor is already running on this host!"
+ alreadyrunning = giveup "Propellor is already running on this host!"
-- | Chains to a propellor sub-Process, forwarding its output on to the
-- display, except for the last line which is a Result.
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index dd1085d7..2d5a244f 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -177,13 +177,10 @@ armAutoBuilder :: DebianSuite -> Architecture -> Flavor -> Property (HasInfo + D
armAutoBuilder suite arch flavor =
propertyList "arm git-annex autobuilder" $ props
& standardAutoBuilder suite arch flavor
- & buildDepsNoHaskellLibs
+ & buildDepsApt
-- Works around ghc crash with parallel builds on arm.
& (homedir </> ".cabal" </> "config")
`File.lacksLine` "jobs: $ncpus"
- -- Install patched haskell packages for portability to
- -- arm NAS's using old kernel versions.
- & haskellPkgsInstalled "linux"
androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container
androidAutoBuilderContainer crontimes timeout =