diff options
author | Joey Hess <joey@kitenet.net> | 2013-12-10 15:46:12 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-12-10 15:46:12 -0400 |
commit | a0aab76ae762614041720dd55d63ed3e0b7c1c94 (patch) | |
tree | 03a7aeb1a01ab7428565554f06a8adae0e190311 /Utility/Rsync.hs | |
parent | 7822ea69246fb0415c0794bcab721a2111735496 (diff) | |
download | git-repair-a0aab76ae762614041720dd55d63ed3e0b7c1c94.tar.gz |
sync from git-annex
Diffstat (limited to 'Utility/Rsync.hs')
-rw-r--r-- | Utility/Rsync.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index 5f322a0..2c5e39b 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -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. -} |