diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-28 13:51:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-28 13:51:14 -0400 |
| commit | ef8c4afd050cc729819b97a1f8864f613b6debbd (patch) | |
| tree | f1e2aa10bdc7efe682913af317fcf3bd1c05fec6 /Remote/Rsync.hs | |
| parent | 9600c62cef11809a32a86cc48824a647f87fcc44 (diff) | |
rsync special remote: Include annex-rsync-options when running rsync to test a key's presence.
Also, use the new withQuietOutput function to avoid running the shell to
/dev/null stderr in two other places.
Diffstat (limited to 'Remote/Rsync.hs')
| -rw-r--r-- | Remote/Rsync.hs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index c3ef94a71..d89699270 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -166,9 +166,12 @@ checkPresent r o k = do -- to connect, and the file not being present. Right <$> check where - check = untilTrue (rsyncUrls o k) $ \u -> - liftIO $ boolSystem "sh" [Param "-c", Param (cmd u)] - cmd u = "rsync --quiet " ++ shellEscape u ++ " 2>/dev/null" + check = untilTrue (rsyncUrls o k) $ \u -> + liftIO $ catchBoolIO $ do + withQuietOutput createProcessSuccess $ + proc "rsync" $ toCommand $ + rsyncOptions o ++ [Param u] + return True {- Rsync params to enable resumes of sending files safely, - ensure that files are only moved into place once complete |