diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-25 03:09:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-25 03:09:06 -0400 |
| commit | d9c5d32c34885cac67c44c633c5351461902d166 (patch) | |
| tree | 2628093b15b5564a33364cf67d54d87ef0f2474e /Annex/Ssh.hs | |
| parent | 2270913743982ab33c68d17c8ed68326e1711f95 (diff) | |
hlint
test suite still passes
Diffstat (limited to 'Annex/Ssh.hs')
| -rw-r--r-- | Annex/Ssh.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 6fd2c556c..3b1e4b457 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -42,7 +42,7 @@ sshCachingOptions (host, port) opts = go =<< sshInfo (host, port) -- If the lock pool is empty, this is the first ssh of this -- run. There could be stale ssh connections hanging around -- from a previous git-annex run that was interrupted. - cleanstale = whenM (not . any isLock . M.keys <$> getPool) $ + cleanstale = whenM (not . any isLock . M.keys <$> getPool) sshCleanup {- Returns a filename to use for a ssh connection caching socket, and @@ -57,9 +57,9 @@ sshInfo (host, port) = go =<< sshCacheDir then return (Just socketfile, sshConnectionCachingParams socketfile) else do socketfile' <- liftIO $ relPathCwdToFile socketfile - if valid_unix_socket_path socketfile' - then return (Just socketfile', sshConnectionCachingParams socketfile') - else return (Nothing, []) + return $ if valid_unix_socket_path socketfile' + then (Just socketfile', sshConnectionCachingParams socketfile') + else (Nothing, []) sshConnectionCachingParams :: FilePath -> [CommandParam] sshConnectionCachingParams socketfile = |