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 | |
| parent | c4257a86ab67f1e08d6ff55bbc91e89858ba3fe7 (diff) | |
fsck: Failed to honor annex.diskreserve when checking a remote.
| -rw-r--r-- | Annex/Content.hs | 4 | ||||
| -rw-r--r-- | Command/Fsck.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 4 insertions, 3 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 ++ diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 5a11ce192..1531d2ab7 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -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) diff --git a/debian/changelog b/debian/changelog index 3703e89b9..6c5430a95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ git-annex (5.20151209) UNRELEASED; urgency=medium * Add S3 features to git-annex version output. * webdav: When testing the WebDAV server, send a file with content. The empty file it was sending tickled bugs in some php WebDAV server. + * fsck: Failed to honor annex.diskreserve when checking a remote. -- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400 |