diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-11 13:50:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-11 13:50:27 -0400 |
| commit | 1b710b96c201e7b9fbecdb876e282f75653dfdea (patch) | |
| tree | f7e02ac0077b13bde9036e0be2d54e84f3c358dc /Annex/Content.hs | |
| parent | c4257a86ab67f1e08d6ff55bbc91e89858ba3fe7 (diff) | |
fsck: Failed to honor annex.diskreserve when checking a remote.
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 289a4f1b3..60ffb8141 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -379,7 +379,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 @@ -403,7 +403,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 ++ |