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

Merge branch 'master' into append

Browse source
This commit is contained in:
Joey Hess 2022-07-18 14:17:15 -04:00
commit ccff639651
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Annex/Journal.hs
View file

@ -84,13 +84,12 @@ setJournalFile _jl ru file content = withOtherTmp $ \tmp -> do
-- journal file is written atomically -- journal file is written atomically
let jfile = journalFile file let jfile = journalFile file
let tmpfile = tmp P.</> jfile let tmpfile = tmp P.</> jfile
let write = liftIO $ do liftIO $ withFile (fromRawFilePath tmpfile) WriteMode $ \h ->
withFile (fromRawFilePath tmpfile) WriteMode $ \h -> writeJournalHandle h content
writeJournalHandle h content let mv = liftIO $ moveFile tmpfile (jd P.</> jfile)
moveFile tmpfile (jd P.</> jfile)
-- avoid overhead of creating the journal directory when it already -- avoid overhead of creating the journal directory when it already
-- exists -- exists
write `catchIO` (const (createAnnexDirectory jd >> write)) mv `catchIO` (const (createAnnexDirectory jd >> mv))
{- Appends content to a journal file. {- Appends content to a journal file.
- -