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

replace removeLink with removeFile

Browse source 
same reasoning as in commit 5cc8d9d03b
This commit is contained in:
Joey Hess 2025-02-11 13:41:26 -04:00
parent 90eb1e2da6
commit f8bb9a8734
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Annex/Content/PointerFile.hs
View file

@ -34,10 +34,9 @@ populatePointerFile :: Restage -> Key -> OsPath -> OsPath -> Annex (Maybe InodeC
populatePointerFile restage k obj f = go =<< liftIO (isPointerFile f)
where
go (Just k') | k == k' = do
let f' = fromOsPath f
destmode <- liftIO $ catchMaybeIO $
fileMode <$> R.getFileStatus f'
liftIO $ removeWhenExistsWith R.removeLink f'
fileMode <$> R.getFileStatus (fromOsPath f)
liftIO $ removeWhenExistsWith removeFile f
(ic, populated) <- replaceWorkTreeFile f $ \tmp -> do
ok <- linkOrCopy k obj tmp destmode >>= \case
Just _ -> thawContent tmp >> return True
@ -55,11 +54,10 @@ populatePointerFile restage k obj f = go =<< liftIO (isPointerFile f)
- Does not check if the pointer file is modified. -}
depopulatePointerFile :: Key -> OsPath -> Annex ()
depopulatePointerFile key file = do
let file' = fromOsPath file
st <- liftIO $ catchMaybeIO $ R.getFileStatus file'
st <- liftIO $ catchMaybeIO $ R.getFileStatus (fromOsPath file)
let mode = fmap fileMode st
secureErase file
liftIO $ removeWhenExistsWith R.removeLink file'
liftIO $ removeWhenExistsWith removeFile file
ic <- replaceWorkTreeFile file $ \tmp -> do
liftIO $ writePointerFile tmp key mode
#if ! defined(mingw32_HOST_OS)