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

rsync special remote: Fix fallback mode for rsync remotes that use hashDirMixed. Closes: #731142

Browse source
This commit is contained in:
Joey Hess 2013-12-02 12:53:39 -04:00
parent f7feb2bbec
commit 0a63ed563f
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utility/Rsync.hs
View file

@ -67,7 +67,8 @@ rsyncParamsFixup = map fixup
-}
rsyncProgress :: MeterUpdate -> [CommandParam] -> IO Bool
rsyncProgress meterupdate params = do
r <- withHandle StdoutHandle createProcessSuccess p (feedprogress 0 [])
r <- catchBoolIO $
withHandle StdoutHandle createProcessSuccess p (feedprogress 0 [])
{- For an unknown reason, piping rsync's output like this does
- causes it to run a second ssh process, which it neglects to wait
- on. Reap the resulting zombie. -}