diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-02 12:53:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-02 12:53:39 -0400 |
| commit | 9293b49b13847df885953aac690f661d88d34dff (patch) | |
| tree | ed9865353aa316890093745269601d606269cfcc /Utility/Rsync.hs | |
| parent | 1a78145e72eeb5abf58e3fee63088ca755a61e50 (diff) | |
rsync special remote: Fix fallback mode for rsync remotes that use hashDirMixed. Closes: #731142
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 5f322a0cb..2c5e39b6e 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. -} |