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.

1 files changed, 8 insertions, 11 deletions

diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index 294270e43..2dd73a8a0 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -99,17 +99,14 @@ sshCleanup = do
 		stopssh socketfile = do
 			let (host, port) = socket2hostport socketfile
 			(_, params) <- sshInfo (host, port)
-			void $ liftIO $ do
-				-- "ssh -O stop" is noisy on stderr even with -q
-				let cmd = unwords $ toCommand $
-					[ Params "-O stop"
-					] ++ params ++ [Param host]
-				boolSystem "sh"
-					[ Param "-c"
-					, Param $ "ssh " ++ cmd ++ " >/dev/null 2>/dev/null"
-					]
-				-- Cannot remove the lock file; other processes may
-				-- be waiting on our exclusive lock to use it.
+			-- "ssh -O stop" is noisy on stderr even with -q
+			void $ liftIO $ catchMaybeIO $
+				withQuietOutput createProcessSuccess $
+					proc "ssh" $ toCommand $
+						[ Params "-O stop"
+						] ++ params ++ [Param host]
+			-- Cannot remove the lock file; other processes may
+			-- be waiting on our exclusive lock to use it.
 
 hostport2socket :: String -> Maybe Integer -> FilePath
 hostport2socket host Nothing = host