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

cleanup

Browse source
This commit is contained in:
Joey Hess 2012-03-06 14:12:15 -04:00
parent d08ee1a9d2
commit dc9049373e
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Command/Add.hs
View file

@ -58,14 +58,12 @@ perform file = do
- This can be called before or after the symlink is in place. -} - This can be called before or after the symlink is in place. -}
undo :: FilePath -> Key -> IOException -> Annex a undo :: FilePath -> Key -> IOException -> Annex a
undo file key e = do undo file key e = do
unlessM (inAnnex key) rethrow -- no cleanup to do whenM (inAnnex key) $ do
liftIO $ whenM (doesFileExist file) $ removeFile file liftIO $ whenM (doesFileExist file) $ removeFile file
handle tryharder $ fromAnnex key file handle tryharder $ fromAnnex key file
logStatus key InfoMissing logStatus key InfoMissing
rethrow throw e
where where
rethrow = throw e
-- fromAnnex could fail if the file ownership is weird -- fromAnnex could fail if the file ownership is weird
tryharder :: IOException -> Annex () tryharder :: IOException -> Annex ()
tryharder _ = do tryharder _ = do