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

minor optimisation and warning fix

Browse source
This commit is contained in:
Joey Hess 2013-05-20 13:58:41 -04:00
parent 94ab82bad8
commit 4c22c2261f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Annex/Direct.hs
View file

@ -206,9 +206,10 @@ toDirectGen k f = do
{- Removes a direct mode file, while retaining its content in the annex. -}
removeDirect :: Key -> FilePath -> Annex ()
removeDirect k f = do
locs <- removeAssociatedFile k f
unlessM (inAnnex k) $
moveAnnex k f
otherlocs <- removeAssociatedFile k f
unless (null otherlocs) $
unlessM (inAnnex k) $
moveAnnex k f
liftIO $ do
nukeFile f
void $ tryIO $ removeDirectory $ parentDir f