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

fix bug introduced in 07f1e638ee

Browse source 
Just totally wrong logic, oops. Caught by test suite.
This commit is contained in:
Joey Hess 2017-02-28 13:24:26 -04:00
parent 75029536e5
commit 7a32e08c4a
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Annex/Direct.hs
View file

@ -385,8 +385,11 @@ removeDirect k f = do
unlessM (inAnnex k) $ unlessM (inAnnex k) $
-- If moveAnnex rejects the content of the key, -- If moveAnnex rejects the content of the key,
-- treat that the same as its content having changed. -- treat that the same as its content having changed.
whenM (goodContent k f <&&> moveAnnex k f) $ ifM (goodContent k f)
logStatus k InfoMissing ( unlessM (moveAnnex k f) $
logStatus k InfoMissing
, logStatus k InfoMissing
)
liftIO $ do liftIO $ do
nukeFile f nukeFile f
void $ tryIO $ removeDirectory $ parentDir f void $ tryIO $ removeDirectory $ parentDir f