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

Merge branch 'master' into ghc7.4

Browse source 
Conflicts:
	Utility/Misc.hs
This commit is contained in:
Joey Hess 2012-02-03 16:48:40 -04:00
commit 44b115e0b1
16 changed files with 78 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Fsck.hs
View file

@ -81,7 +81,7 @@ performRemote key file backend numcopies remote = do
t <- fromRepo gitAnnexTmpDir
let tmp = t </> "fsck" ++ show pid ++ "." ++ keyFile key
liftIO $ createDirectoryIfMissing True t
let cleanup = liftIO $ catch (removeFile tmp) (const $ return ())
let cleanup = liftIO $ catchIO (removeFile tmp) (const $ return ())
cleanup
cleanup `after` a tmp
getfile tmp = do