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

propigate outer output state into inner state when running onLocal

Browse source 
Otherwise, progress displays would not be suppressed here when running with
--quiet. Interesting wrinkle!
This commit is contained in:
Joey Hess 2015-04-03 20:08:38 -04:00
parent d7f66a90af
commit e87f3b40eb
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Remote/Git.hs
View file

@ -542,7 +542,8 @@ onLocal r a = do
cache st = Annex.changeState $ \s -> s cache st = Annex.changeState $ \s -> s
{ Annex.remoteannexstate = M.insert (uuid r) st (Annex.remoteannexstate s) } { Annex.remoteannexstate = M.insert (uuid r) st (Annex.remoteannexstate s) }
go st a' = do go st a' = do
(ret, st') <- liftIO $ Annex.run st $ curro <- Annex.getState Annex.output
(ret, st') <- liftIO $ Annex.run (st { Annex.output = curro }) $
catFileStop `after` a' catFileStop `after` a'
cache st' cache st'
return ret return ret