From 75b6b5cbc7c095e0ae536fe8aa9060f23131c4a2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Apr 2015 15:20:23 -0400 Subject: [PATCH] only display built-in meters in parallel mode --- Remote/Git.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Remote/Git.hs b/Remote/Git.hs index b04d381a86..2b2a68d05b 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