From 41370b2aac2ed4d4ebbaf9e72d9b2bdedbc50d8c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Nov 2017 13:32:32 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src') 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 = -- cgit v1.2.3 From 29a8f8aa044e388f7856c67ae3d495e487df6385 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Nov 2017 13:36:29 -0400 Subject: avoid backtrace from already running on this host message --- src/Propellor/Engine.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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. -- cgit v1.2.3