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 835283b862
This commit is contained in:
Joey Hess 2024-10-28 12:20:10 -04:00
parent 63b33750c9
commit 9db69a4c2c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 7 additions and 1 deletions

View file

@ -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

View file

@ -32,3 +32,5 @@ failed
I tried to rerun build within that env -- the same
> [[fixed|done]] --[[Joey]]

View file

@ -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.
"""]]