diff options
Diffstat (limited to 'Annex/Ssh.hs')
| -rw-r--r-- | Annex/Ssh.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 52959ef7b..4d54d728e 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -92,7 +92,8 @@ bestSocketPath abssocketfile = do sshConnectionCachingParams :: FilePath -> [CommandParam] sshConnectionCachingParams socketfile = [ Param "-S", Param socketfile - , Params "-o ControlMaster=auto -o ControlPersist=yes" + , Param "-o", Param "ControlMaster=auto" + , Param "-o", Param "ControlPersist=yes" ] {- ssh connection caching creates sockets, so will not work on a @@ -180,8 +181,8 @@ forceStopSsh socketfile = do void $ liftIO $ catchMaybeIO $ withQuietOutput createProcessSuccess $ (proc "ssh" $ toCommand $ - [ Params "-O stop" - ] ++ params ++ [Param "localhost"]) + [ Param "-O", Param "stop" ] ++ + params ++ [Param "localhost"]) { cwd = Just dir } liftIO $ nukeFile socketfile |