diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-06-01 13:52:23 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-01 13:52:23 -0400 |
| commit | 39c13f91004b41166b786785083e78b34df0c48f (patch) | |
| tree | bf5ea0acf27c9075a63d3b23b970c3ea44ecee64 /Annex/Ssh.hs | |
| parent | 3a9ca30fa8740a57ea477243498339f9738102d6 (diff) | |
remove Params constructor from Utility.SafeCommand
This removes a bit of complexity, and should make things faster
(avoids tokenizing Params string), and probably involve less garbage
collection.
In a few places, it was useful to use Params to avoid needing a list,
but that is easily avoided.
Problems noticed while doing this conversion:
* Some uses of Params "oneword" which was entirely unnecessary
overhead.
* A few places that built up a list of parameters with ++
and then used Params to split it!
Test suite passes.
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 |