didn't quite get removeDirect right before, this passes test suite
This commit is contained in:
parent
46eb1ea1e7
commit
d88be65495
2 changed files with 19 additions and 8 deletions
|
@ -8,6 +8,7 @@
|
|||
module Annex.Content.Direct (
|
||||
associatedFiles,
|
||||
removeAssociatedFile,
|
||||
removeAssociatedFileUnchecked,
|
||||
addAssociatedFile,
|
||||
goodContent,
|
||||
recordedInodeCache,
|
||||
|
@ -73,15 +74,22 @@ changeAssociatedFiles key transform = do
|
|||
hPutStr h content
|
||||
hClose h
|
||||
|
||||
{- Removes an associated file. Returns new associatedFiles value. -}
|
||||
{- Removes an associated file. Returns new associatedFiles value.
|
||||
- Checks if this was the last copy of the object, and updates location
|
||||
- log. -}
|
||||
removeAssociatedFile :: Key -> FilePath -> Annex [FilePath]
|
||||
removeAssociatedFile key file = do
|
||||
file' <- normaliseAssociatedFile file
|
||||
fs <- changeAssociatedFiles key $ filter (/= file')
|
||||
fs <- removeAssociatedFileUnchecked key file
|
||||
when (null fs) $
|
||||
logStatus key InfoMissing
|
||||
return fs
|
||||
|
||||
{- Removes an associated file. Returns new associatedFiles value. -}
|
||||
removeAssociatedFileUnchecked :: Key -> FilePath -> Annex [FilePath]
|
||||
removeAssociatedFileUnchecked key file = do
|
||||
file' <- normaliseAssociatedFile file
|
||||
changeAssociatedFiles key $ filter (/= file')
|
||||
|
||||
{- Adds an associated file. Returns new associatedFiles value. -}
|
||||
addAssociatedFile :: Key -> FilePath -> Annex [FilePath]
|
||||
addAssociatedFile key file = do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue