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, 6 insertions, 4 deletions

diff --git a/Remote/Git.hs b/Remote/Git.hs
index 860a53e18..334c8144a 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -429,10 +429,12 @@ commitOnCleanup r a = go `after` a
 			| otherwise = void $ do
 				Just (shellcmd, shellparams) <-
 					git_annex_shell r "commit" [] []
+				
 				-- Throw away stderr, since the remote may not
 				-- have a new enough git-annex shell to
 				-- support committing.
-				let cmd = shellcmd ++ " "
-					++ unwords (map shellEscape $ toCommand shellparams)
-					++ ">/dev/null 2>/dev/null"
-				liftIO $ boolSystem "sh" [Param "-c", Param cmd]
+				liftIO $ catchMaybeIO $ do
+					print "!!!!!!!!!!!!!"
+					withQuietOutput createProcessSuccess $
+						proc shellcmd $
+							toCommand shellparams