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

rsync: Fix bug introduced in last release that broke encrypted rsync special remotes.

Browse source
This commit is contained in:
Joey Hess 2012-11-27 16:29:31 -04:00
parent 83aa8187c6
commit 5ff666ec99
3 changed files with 7 additions and 1 deletions

2
Remote/Rsync.hs
View file

@ -110,7 +110,7 @@ store o k _f p = rsyncSend o p k <=< inRepo $ gitAnnexLocation k
storeEncrypted :: RsyncOpts -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool
storeEncrypted o (cipher, enck) k p = withTmp enck $ \tmp -> do
src <- inRepo $ gitAnnexLocation k
liftIO $ decrypt cipher (feedFile src) $
liftIO $ encrypt cipher (feedFile src) $
readBytes $ L.writeFile tmp
rsyncSend o p enck tmp

2
debian/changelog vendored
View file

@ -2,6 +2,8 @@ git-annex (3.20121127) UNRELEASED; urgency=low
* Fix dirContentsRecursive, which had missed some files in deeply nested
subdirectories. Could affect various parts of git-annex.
* rsync: Fix bug introduced in last release that broke encrypted rsync
special remotes.
-- Joey Hess <joeyh@debian.org> Mon, 26 Nov 2012 16:45:19 -0400

4
doc/bugs/Can__39__t_transfer_files_to_rsync_remote_with_encryption__61__shared.mdwn
View file

@ -48,3 +48,7 @@ Here's the output with `--debug`:
I'm using git-annex 3.20121127. I think I was able to transfer files to that remote with the previous release.
Any idea how to fix this? Am I doing something wrong?
> Damn. This was a completely stupid bug, calling "decrypt" where it was
> supposed to call "encrypt". [[done]] in git; I'll have to
> make a new release to fix this. --[[Joey]]