From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 22 Jul 2022 15:36:21 +0000 (-0400)
Subject: force fully strict read of journal file again
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~72^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cbe12b9bc33a74f7e9edf651490c07b74f8689a3;p=git-annex.git

force fully strict read of journal file again

I was thinking that discardIncompleteAppend would make it strict, since
it looks at the end of the bytestring. But, it's applied lazily..

This probably fixes windows, which was failing:

      git-annex.exe: .git\annex\journal\trust.log: DeleteFile "\\\\?\\C:\\Users\\runneradmin\\.t\\5\\tmprepo22\\.git\\annex\\journal\\trust.log": permission denied (The process cannot access the file because it is being used by another process.)
---

diff --git a/Annex/Journal.hs b/Annex/Journal.hs
index db3c0a3587..249fb20037 100644
--- a/Annex/Journal.hs
+++ b/Annex/Journal.hs
@@ -196,8 +196,8 @@ getJournalFileStale (GetPrivate getprivate) file = do
   where
 	jfile = journalFile file
 	getfrom d = catchMaybeIO $
-		discardIncompleteAppend 
-			<$> L.readFile (fromRawFilePath (d P.</> jfile))
+		discardIncompleteAppend . L.fromStrict
+			<$> B.readFile (fromRawFilePath (d P.</> jfile))
 
 -- Note that this forces read of the whole lazy bytestring.
 discardIncompleteAppend :: L.ByteString -> L.ByteString