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

fix lost metering for fallback rsyncs

Browse source 
08814327ff accidentially got rid of it,
when it removed commandMetered.
This commit is contained in:
Joey Hess 2018-03-12 17:56:39 -04:00
parent abe8346dca
commit cb05ef06bf
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Remote/Helper/Ssh.hs
View file

@ -113,11 +113,12 @@ dropKey r key = onRemote NoConsumeStdin r (boolSystem, return False) "dropkey"
rsyncHelper :: Maybe MeterUpdate -> [CommandParam] -> Annex Bool
rsyncHelper m params = do
showOutput -- make way for progress bar
a <- case m of
Nothing -> return $ rsync params
Nothing -> do
showOutput -- make way for progress bar
return $ rsync params
Just meter -> do
oh <- mkOutputHandler
oh <- mkOutputHandlerQuiet
return $ rsyncProgress oh meter params
ifM (liftIO a)
( return True