diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-11 13:50:31 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-11 13:50:31 -0400 |
| commit | 69a64069bbe72421186d08a8fb28de889caac942 (patch) | |
| tree | 536df96010e5c66edf583466ebf983b5451f3e28 /Annex/Content.hs | |
| parent | d769454704555d7e969754de22e32fd7ed738aaa (diff) | |
| parent | 1b710b96c201e7b9fbecdb876e282f75653dfdea (diff) | |
Merge branch 'master' into smudge
Diffstat (limited to 'Annex/Content.hs')
| -rw-r--r-- | Annex/Content.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 912831db5..d89e90f2a 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -397,7 +397,7 @@ withTmp key action = do - when doing concurrent downloads. -} checkDiskSpace :: Maybe FilePath -> Key -> Integer -> Bool -> Annex Bool -checkDiskSpace destination key alreadythere samefilesystem = ifM (Annex.getState Annex.force) +checkDiskSpace destdir key alreadythere samefilesystem = ifM (Annex.getState Annex.force) ( return True , do -- We can't get inprogress and free at the same @@ -421,7 +421,7 @@ checkDiskSpace destination key alreadythere samefilesystem = ifM (Annex.getState _ -> return True ) where - dir = maybe (fromRepo gitAnnexDir) return destination + dir = maybe (fromRepo gitAnnexDir) return destdir needmorespace n = warning $ "not enough free space, need " ++ roughSize storageUnits True n ++ |