mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages1 Wiki Activity Actions

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.

Browse source
This commit is contained in:
Joey Hess 2014-09-11 13:21:35 -04:00
parent 6bd75d7966
commit a97c9e43b7
3 changed files with 7 additions and 1 deletions

2
Remote/Rsync.hs
View file

@ -92,7 +92,7 @@ gen r u c gc = do
genRsyncOpts :: RemoteConfig -> RemoteGitConfig -> [CommandParam] -> RsyncUrl -> RsyncOpts genRsyncOpts :: RemoteConfig -> RemoteGitConfig -> [CommandParam] -> RsyncUrl -> RsyncOpts
genRsyncOpts c gc transport url = RsyncOpts genRsyncOpts c gc transport url = RsyncOpts
{ rsyncUrl = url { rsyncUrl = url
, rsyncOptions = opts [] , rsyncOptions = transport ++ opts []
, rsyncUploadOptions = transport ++ opts (remoteAnnexRsyncUploadOptions gc) , rsyncUploadOptions = transport ++ opts (remoteAnnexRsyncUploadOptions gc)
, rsyncDownloadOptions = transport ++ opts (remoteAnnexRsyncDownloadOptions gc) , rsyncDownloadOptions = transport ++ opts (remoteAnnexRsyncDownloadOptions gc)
, rsyncShellEscape = M.lookup "shellescape" c /= Just "no" , rsyncShellEscape = M.lookup "shellescape" c /= Just "no"

3
debian/changelog vendored
View file

@ -7,6 +7,9 @@ git-annex (5.20140832) UNRELEASED; urgency=medium
untrusted. untrusted.
* Fix parsing of ipv6 address in git remote address when it was not * Fix parsing of ipv6 address in git remote address when it was not
formatted as an url. 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 -- Joey Hess <joeyh@debian.org> Thu, 04 Sep 2014 16:17:22 -0400

3
doc/bugs/annex-rsync-transport_ignored.mdwn
View file

@ -25,3 +25,6 @@ git annex version gives:
upgrade supported from repository versions: 0 1 2 4 upgrade supported from repository versions: 0 1 2 4
which is the latest available linux-armel version. which is the latest available linux-armel version.
> Also removing didn't use the configured transport. Both [[fixed|done]]
> --[[Joey]]