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 /src/Propellor/Engine.hs | |
| parent | 0d97c489c9c4cd987e4c41f4d7a1fa3189fb0e97 (diff) | |
| parent | 3dfd1a7cd5dc9b5a099d0366b2eb5aadd33cb9e3 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Engine.hs')
| -rw-r--r-- | src/Propellor/Engine.hs | 2 |
1 files changed, 1 insertions, 1 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. |