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.
This commit is contained in:
Joey Hess 2012-10-28 13:51:14 -04:00
parent 67454ab7f3
commit 9767562f65
6 changed files with 39 additions and 18 deletions

View file

@ -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