diff options
| author | Mario Lang <mlang@delysid.org> | 2015-09-13 00:46:49 +0200 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-13 13:21:41 -0400 |
| commit | b84c9bbb7c9db688118ad756c1c43ef034fd98fb (patch) | |
| tree | 61d50f50f58714e9df2390c337fa7bb2ff34d3ea /src/Propellor/Spin.hs | |
| parent | 2af70d4ac7ff25a3e596de195abe40db46c74074 (diff) | |
Follow some hlint suggestions.
Diffstat (limited to 'src/Propellor/Spin.hs')
| -rw-r--r-- | src/Propellor/Spin.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index cce754ca..c5b31cef 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -59,7 +59,7 @@ spin target relay hst = do -- And now we can run it. unlessM (boolSystem "ssh" (map Param $ cacheparams ++ ["-t", sshtarget, shellWrap runcmd])) $ - error $ "remote propellor failed" + error "remote propellor failed" where hn = fromMaybe target relay @@ -184,7 +184,7 @@ updateServer target relay hst connect haveprecompiled = let loop = go (toh, fromh) let restart = updateServer hn relay hst connect haveprecompiled let done = return () - v <- (maybe Nothing readish <$> getMarked fromh statusMarker) + v <- maybe Nothing readish <$> getMarked fromh statusMarker case v of (Just NeedRepoUrl) -> do sendRepoUrl toh @@ -263,7 +263,7 @@ sendGitClone hn = void $ actionMessage ("Clone git repository to " ++ hn) $ do -- This should be reasonably portable, as long as the remote host has the -- same architecture as the build host. sendPrecompiled :: HostName -> IO () -sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor as a last resort") $ do +sendPrecompiled hn = void $ actionMessage "Uploading locally compiled propellor as a last resort" $ bracket getWorkingDirectory changeWorkingDirectory $ \_ -> withTmpDir "propellor" go where |
