From 0957b771da4c58f593f3ecaf194ffdd5c6d335a5 Mon Sep 17 00:00:00 2001 From: guilhem Date: Sun, 14 Apr 2013 00:10:49 +0200 Subject: Allow rsync to use other remote shells. Introduced a new per-remote option 'annex-rsync-transport' to specify the remote shell that it to be used with rsync. In case the value is 'ssh', connections are cached unless 'sshcaching' is unset. --- Remote/Helper/Ssh.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Remote/Helper/Ssh.hs') diff --git a/Remote/Helper/Ssh.hs b/Remote/Helper/Ssh.hs index 135b5c144..2e6b6d57c 100644 --- a/Remote/Helper/Ssh.hs +++ b/Remote/Helper/Ssh.hs @@ -22,9 +22,10 @@ sshToRepo :: Git.Repo -> [CommandParam] -> Annex [CommandParam] sshToRepo repo sshcmd = do g <- fromRepo id let c = extractRemoteGitConfig g (Git.repoDescribe repo) - let opts = map Param $ remoteAnnexSshOptions c - params <- sshParams (Git.Url.hostuser repo, Git.Url.port repo) opts - return $ params ++ sshcmd + opts = map Param $ remoteAnnexSshOptions c + host = Git.Url.hostuser repo + params <- sshCachingOptions (host, Git.Url.port repo) opts + return $ params ++ Param host : sshcmd {- Generates parameters to run a git-annex-shell command on a remote - repository. -} -- cgit v1.2.3