summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-12 15:19:08 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-12 15:20:22 -0400
commitb94eafec8c4a7868da753f9b22ca823552e9764c (patch)
treeb56d9b021182fa6e143cae726a9417f7233c3752 /Command
parentfd33ca1ed6709837bc92d065ff345478e359a7d2 (diff)
Take space that will be used by running downloads into account when checking annex.diskreserve.
Diffstat (limited to 'Command')
-rw-r--r--Command/Fsck.hs2
-rw-r--r--Command/Unlock.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 8414b5b26..26c788d56 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -135,7 +135,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)
+ getfile tmp = ifM (checkDiskSpace (Just tmp) key 0 True)
( ifM (Remote.retrieveKeyFileCheap remote key (Just file) tmp)
( return (Just True)
, ifM (Annex.getState Annex.fast)
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index 208381930..a1b1ce411 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -43,7 +43,7 @@ start file key = do
)
perform :: FilePath -> Key -> CommandPerform
-perform dest key = ifM (checkDiskSpace Nothing key 0)
+perform dest key = ifM (checkDiskSpace Nothing key 0 True)
( do
src <- calcRepo $ gitAnnexLocation key
tmpdest <- fromRepo $ gitAnnexTmpObjectLocation key