diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-11-22 15:29:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-22 15:29:39 -0400 |
| commit | 311ea71bf5c800cd102f5e7b55ea51b89d1f3f46 (patch) | |
| tree | 3c3041d212ca05d0771b8e5d1c1dd08fade27d1a | |
| parent | 0d97c489c9c4cd987e4c41f4d7a1fa3189fb0e97 (diff) | |
| parent | 3dfd1a7cd5dc9b5a099d0366b2eb5aadd33cb9e3 (diff) | |
Merge branch 'joeyconfig'
| l--------- | config.hs | 2 | ||||
| -rw-r--r-- | privdata/relocate | 1 | ||||
| -rw-r--r-- | src/Propellor/Engine.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 5 |
4 files changed, 4 insertions, 6 deletions
@@ -1 +1 @@ -config-simple.hs
\ No newline at end of file +joeyconfig.hs
\ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate new file mode 100644 index 00000000..271692d8 --- /dev/null +++ b/privdata/relocate @@ -0,0 +1 @@ +.joeyconfig 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 = |