fix reversion in getting from unchunked encrypted special remotes

Have to use the object file for the encrypted key, not the unencrypted
key.

Bug introduced in 835283b86240ef4b68c44f4332ac1b644e08e49f

diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs
index 7ebdfdccef477c37e337e78038c2bae9ff699226..9b40d5b10c17859e2bbcba22db0aad7cda00f61e 100644 (file)
--- a/Remote/Helper/Chunked.hs
+++ b/Remote/Helper/Chunked.hs
@@ -328,7 +328,9 @@ retrieveChunks retriever u vc chunkconfig encryptor basek dest basep enc encc
                iv <- startVerifyKeyContentIncrementally vc basek
                case enc of
                        Just _ -> do
-                               retriever (encryptor basek) basep (toRawFilePath dest) Nothing $
+                               let enck = encryptor basek
+                               objloc <- fromRepo $ gitAnnexTmpObjectLocation enck
+                               retriever (encryptor basek) basep objloc Nothing $
                                        retrieved iv Nothing basep
                                return (Right iv)
                        -- Not chunked and not encrypted, so ask the

diff --git a/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg.mdwn b/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg.mdwn
index f35837148b45f3d67933c0f03f1c7a25fbc5ad3e..44d4050978deeeee7e9699a610dee8f5abe81dd9 100644 (file)
--- a/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg.mdwn
+++ b/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg.mdwn
@@ -32,3 +32,5 @@ failed
 
 
 I tried to rerun build within that env -- the same
+
+> [[fixed|done]] --[[Joey]]

diff --git a/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg/comment_1_a59ada9b508ec7828bbf3a9c8fbd2c2c._comment b/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg/comment_1_a59ada9b508ec7828bbf3a9c8fbd2c2c._comment
index fe941419cc08c38781280bc929a1937c8b543f29..27b4263e8dfec37dcb76be61424397a3d85ed000 100644 (file)
--- a/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg/comment_1_a59ada9b508ec7828bbf3a9c8fbd2c2c._comment
+++ b/doc/bugs/v10_locked_gpg_crypto_test_fails_while_debian_pkg/comment_1_a59ada9b508ec7828bbf3a9c8fbd2c2c._comment
@@ -10,4 +10,6 @@ The file is mode 444, which is a permission git-annex sets. Then git-annex
 opens it for write. Oops..
 
 Bisected to [[!commit 835283b86240ef4b68c44f4332ac1b644e08e49f]].
+
+Fixed.
 """]]