diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-09-11 13:21:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-09-11 13:21:35 -0400 |
| commit | 044d98179e120164ec4d1a1015a88bb358c8ab8e (patch) | |
| tree | ec853f00d87d84150d7d0453af32e452c156b14e | |
| parent | d0fc7537b2ef83ce33905c1851eeff2363c09721 (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.
| -rw-r--r-- | Remote/Rsync.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/annex-rsync-transport_ignored.mdwn | 3 |
3 files changed, 7 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" diff --git a/debian/changelog b/debian/changelog index fee2a3666..c5cde761c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ git-annex (5.20140832) UNRELEASED; urgency=medium untrusted. * Fix parsing of ipv6 address in git remote address when it was not formatted as an url. + * 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. -- Joey Hess <joeyh@debian.org> Thu, 04 Sep 2014 16:17:22 -0400 diff --git a/doc/bugs/annex-rsync-transport_ignored.mdwn b/doc/bugs/annex-rsync-transport_ignored.mdwn index 385da139a..1c6923a88 100644 --- a/doc/bugs/annex-rsync-transport_ignored.mdwn +++ b/doc/bugs/annex-rsync-transport_ignored.mdwn @@ -25,3 +25,6 @@ git annex version gives: upgrade supported from repository versions: 0 1 2 4 which is the latest available linux-armel version. + +> Also removing didn't use the configured transport. Both [[fixed|done]] +> --[[Joey]] |