diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-15 14:52:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-15 14:52:03 -0400 |
| commit | 454c990ce49af450d3177f2ea9c6132681959078 (patch) | |
| tree | 9c11d10ccac85d646f7c85a1e51b71efc0a7c28a /Annex/Direct.hs | |
| parent | a4ea1393cef234518bfa8dcaeb522259a485b414 (diff) | |
Direct mode .git/annex/objects directories are no longer left writable
Because that allowed writing to symlinks of files that are not present,
which followed the link and put bad content in an object location.
fsck: Fix up .git/annex/object directory permissions.
This commit was sponsored by an anonymous bitcoin donor.
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index 366966fc2..3fa5f9362 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -210,11 +210,11 @@ toDirectGen k f = do where fromindirect loc = do {- Move content from annex to direct file. -} - thawContentDir loc updateInodeCache k loc void $ addAssociatedFile k f - thawContent loc - replaceFile f $ liftIO . moveFile loc + modifyContent loc $ do + thawContent loc + replaceFile f $ liftIO . moveFile loc fromdirect loc = do replaceFile f $ liftIO . void . copyFileExternal loc |