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

Merge branch 'master' into smudge

Browse source
This commit is contained in:
Joey Hess 2015-12-11 13:50:31 -04:00
commit c608a752a5
Failed to extract signature
13 changed files with 163 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Fsck.hs
View file

@ -162,7 +162,7 @@ performRemote key file backend numcopies remote =
let cleanup = liftIO $ catchIO (removeFile tmp) (const noop)
cleanup
cleanup `after` a tmp
getfile tmp = ifM (checkDiskSpace (Just tmp) key 0 True)
getfile tmp = ifM (checkDiskSpace (Just (takeDirectory tmp)) key 0 True)
( ifM (Remote.retrieveKeyFileCheap remote key (Just file) tmp)
( return (Just True)
, ifM (Annex.getState Annex.fast)