summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-10 15:20:23 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-10 15:20:23 -0400
commitb4dd6c2250efd959c2b0c0d032d9508ef55ea79a (patch)
tree692cdfa6df496a9d75f35be8a081d5727f02624f /Remote
parent46006fd6e5874939e491b12ef978901d8e1aae84 (diff)
only display built-in meters in parallel mode
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Git.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index b04d381a8..2b2a68d05 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -355,7 +355,7 @@ dropKey r key
{- Tries to copy a key's content from a remote's annex to a file. -}
copyFromRemote :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool
-copyFromRemote r key file dest p = metered (Just p) key $
+copyFromRemote r key file dest p = parallelMetered (Just p) key $
copyFromRemote' r key file dest
copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool
@@ -456,7 +456,7 @@ copyFromRemoteCheap r key file
liftIO $ catchBoolIO $ createSymbolicLink loc file >> return True
| Git.repoIsSsh (repo r) =
ifM (Annex.Content.preseedTmp key file)
- ( metered Nothing key $ copyFromRemote' r key Nothing file
+ ( parallelMetered Nothing key $ copyFromRemote' r key Nothing file
, return False
)
| otherwise = return False