diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs index 7ebdfdccef..9b40d5b10c 100644 --- 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 f35837148b..44d4050978 100644 --- 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 fe941419cc..27b4263e8d 100644 --- 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. """]]