mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only display built-in meters in parallel mode

Browse source
This commit is contained in:
Joey Hess 2015-04-10 15:20:23 -04:00
parent 0880c8319e
commit 75b6b5cbc7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Remote/Git.hs
View file

@ -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