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

fix perms for core.sharedRepository

Browse source 
These two missed setting it.

It rarely matters that the journal gets the right perm. But, when using
annex.alwayscommit=false, someone else may come along later and want
to append to the journal file.

It probably never matters what the sentinal perms are, but for
completeness..

Sponsored-by: Luke Shumaker on Patreon
This commit is contained in:
Joey Hess 2023-04-26 16:22:15 -04:00
parent f971b199ed
commit 0aa98aa09b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/InodeSentinal.hs
View file

@ -93,6 +93,8 @@ createInodeSentinalFile evenwithobjects =
s <- annexSentinalFile s <- annexSentinalFile
createAnnexDirectory (parentDir (sentinalFile s)) createAnnexDirectory (parentDir (sentinalFile s))
liftIO $ writeSentinalFile s liftIO $ writeSentinalFile s
setAnnexFilePerm (sentinalFile s)
setAnnexFilePerm (sentinalCacheFile s)
where where
alreadyexists = liftIO. sentinalFileExists =<< annexSentinalFile alreadyexists = liftIO. sentinalFileExists =<< annexSentinalFile
hasobjects hasobjects

5
Annex/Journal.hs
View file

@ -91,7 +91,10 @@ setJournalFile _jl ru file content = withOtherTmp $ \tmp -> do
let tmpfile = tmp P.</> jfile let tmpfile = tmp P.</> jfile
liftIO $ withFile (fromRawFilePath tmpfile) WriteMode $ \h -> liftIO $ withFile (fromRawFilePath tmpfile) WriteMode $ \h ->
writeJournalHandle h content writeJournalHandle h content
let mv = liftIO $ moveFile tmpfile (jd P.</> jfile) let dest = jd P.</> jfile
let mv = do
liftIO $ moveFile tmpfile dest
setAnnexFilePerm dest
-- avoid overhead of creating the journal directory when it already -- avoid overhead of creating the journal directory when it already
-- exists -- exists
mv `catchIO` (const (createAnnexDirectory jd >> mv)) mv `catchIO` (const (createAnnexDirectory jd >> mv))

5
CHANGELOG
View file

@ -29,9 +29,10 @@ git-annex (10.20230408) UNRELEASED; urgency=medium
--json-error-messages is enabled, output a JSON object indicating the --json-error-messages is enabled, output a JSON object indicating the
problem. (But git ls-files --error-unmatch still displays errors about problem. (But git ls-files --error-unmatch still displays errors about
such files in some situations.) such files in some situations.)
* init: Bug fix: Create .git/annex/ and .git/annex/fsckdb/ directories with
permissions configured by core.sharedRepository.
* Warn about unsupported core.sharedRepository=0xxx when set. * Warn about unsupported core.sharedRepository=0xxx when set.
* Bug fix: Create .git/annex/, .git/annex/fsckdb,
.git/annex/sentinal, .git/annex/sentinal.cache, and
.git/annex/journal/* with permissions configured by core.sharedRepository.
-- Joey Hess <id@joeyh.name> Sat, 08 Apr 2023 13:57:18 -0400 -- Joey Hess <id@joeyh.name> Sat, 08 Apr 2023 13:57:18 -0400