summaryrefslogtreecommitdiff
path: root/Remote/Rsync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-09-11 13:21:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-09-11 13:21:35 -0400
commit044d98179e120164ec4d1a1015a88bb358c8ab8e (patch)
treeec853f00d87d84150d7d0453af32e452c156b14e /Remote/Rsync.hs
parentd0fc7537b2ef83ce33905c1851eeff2363c09721 (diff)
The annex-rsync-transport configuration is now also used when checking if a key is present on a rsync remote, and when dropping a key from the remote.
Diffstat (limited to 'Remote/Rsync.hs')
-rw-r--r--Remote/Rsync.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index f7b3461a0..698d733e6 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -92,7 +92,7 @@ gen r u c gc = do
genRsyncOpts :: RemoteConfig -> RemoteGitConfig -> [CommandParam] -> RsyncUrl -> RsyncOpts
genRsyncOpts c gc transport url = RsyncOpts
{ rsyncUrl = url
- , rsyncOptions = opts []
+ , rsyncOptions = transport ++ opts []
, rsyncUploadOptions = transport ++ opts (remoteAnnexRsyncUploadOptions gc)
, rsyncDownloadOptions = transport ++ opts (remoteAnnexRsyncDownloadOptions gc)
, rsyncShellEscape = M.lookup "shellescape" c /= Just "no"