summaryrefslogtreecommitdiff
path: root/Utility/Rsync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-08-08 23:25:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-08-08 23:25:38 -0400
commit4475497e653a63823b95a0fa0b176a7baf080a7b (patch)
tree3fa2a824f16a1d9d44fd9395de1dc7d426835c79 /Utility/Rsync.hs
parent4e303cca921722d4274eece477b52d196cc7c0e1 (diff)
parent69e1ee3fde8530361ce4c0569f4ec2175f2d86a7 (diff)
Merge branch 'newchunks'
Diffstat (limited to 'Utility/Rsync.hs')
-rw-r--r--Utility/Rsync.hs10
1 files changed, 2 insertions, 8 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs
index 60381264e..d0a89b2b0 100644
--- a/Utility/Rsync.hs
+++ b/Utility/Rsync.hs
@@ -66,14 +66,8 @@ rsyncParamsFixup = map fixup
- The params must enable rsync's --progress mode for this to work.
-}
rsyncProgress :: MeterUpdate -> [CommandParam] -> IO Bool
-rsyncProgress meterupdate params = do
- 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. -}
- reapZombies
- return r
+rsyncProgress meterupdate params = catchBoolIO $
+ withHandle StdoutHandle createProcessSuccess p (feedprogress 0 [])
where
p = proc "rsync" (toCommand $ rsyncParamsFixup params)
feedprogress prev buf h = do