summaryrefslogtreecommitdiff
path: root/Annex/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-16 21:21:58 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-16 21:21:58 -0400
commitb30f9c5660be384e0fc75a9378101439f15954a7 (patch)
treedafb6fb570c4d75b7ac514a72b81c24e0fd49fe8 /Annex/Content.hs
parent89e8441c62b985a6bcf37024fc051e99fbce8e37 (diff)
avoid spawning file size polling thread when not in -J mode
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r--Annex/Content.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 90486f912..612a96a6b 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -660,10 +660,8 @@ saveState nocommit = doSideAction $ do
{- Downloads content from any of a list of urls. -}
downloadUrl :: Key -> MeterUpdate -> [Url.URLString] -> FilePath -> Annex Bool
-downloadUrl k p urls file =
- concurrentMetered (Just p) k $ \p' ->
- watchFileSize file p' $
- go =<< annexWebDownloadCommand <$> Annex.getGitConfig
+downloadUrl k p urls file = concurrentMeteredFile file (Just p) k $
+ go =<< annexWebDownloadCommand <$> Annex.getGitConfig
where
go Nothing = do
a <- ifM commandProgressDisabled