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/Git.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/Git.hs')
-rw-r--r-- | Remote/Git.hs | 10 |
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 |