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

finish making rsync support chunking

Browse source 
This breaks gcrypt, which relies on some internals of the rsync remote.
To fix next..
This commit is contained in:
Joey Hess 2014-08-03 16:54:57 -04:00
parent 6c450aad1d
commit f5f961215b
3 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Remote/GCrypt.hs
View file

@ -299,7 +299,7 @@ store r rsyncopts (cipher, enck) k p
| otherwise = unsupportedUrl
where
gpgopts = getGpgEncParams r
storersync = Remote.Rsync.storeEncrypted rsyncopts gpgopts (cipher, enck) k p
storersync = undefined -- Remote.Rsync.storeEncrypted rsyncopts gpgopts (cipher, enck) k p
storeshell = withTmp enck $ \tmp ->
ifM (spoolencrypted $ readBytes $ \b -> catchBoolIO $ L.writeFile tmp b >> return True)
( Ssh.rsyncHelper (Just p)
@ -323,7 +323,7 @@ retrieve r rsyncopts (cipher, enck) k d p
a >>= \b ->
decrypt cipher (feedBytes b)
(readBytes $ meteredWriteFile meterupdate d)
retrieversync = Remote.Rsync.retrieveEncrypted rsyncopts (cipher, enck) k d p
retrieversync = undefined -- Remote.Rsync.retrieveEncrypted rsyncopts (cipher, enck) k d p
retrieveshell = withTmp enck $ \tmp ->
ifM (Ssh.rsyncHelper (Just p) =<< Ssh.rsyncParamsRemote False r Download enck tmp Nothing)
( liftIO $ catchBoolIO $ do