From ef8c4afd050cc729819b97a1f8864f613b6debbd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 28 Oct 2012 13:51:14 -0400 Subject: 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. --- Remote/Git.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Remote/Git.hs') 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 -- cgit v1.2.3