in which I discover void
void :: Functor f => f a -> f () -- ah, of course that's useful :)
This commit is contained in:
parent
be36aaca5b
commit
bee420bd2d
6 changed files with 16 additions and 29 deletions
|
@ -313,7 +313,7 @@ commitOnCleanup r a = go `after` a
|
|||
cleanup
|
||||
| not $ Git.repoIsUrl r = liftIO $ onLocal r $
|
||||
Annex.Branch.commit "update"
|
||||
| otherwise = do
|
||||
| otherwise = void $ do
|
||||
Just (shellcmd, shellparams) <-
|
||||
git_annex_shell r "commit" []
|
||||
-- Throw away stderr, since the remote may not
|
||||
|
@ -322,6 +322,4 @@ commitOnCleanup r a = go `after` a
|
|||
let cmd = shellcmd ++ " "
|
||||
++ unwords (map shellEscape $ toCommand shellparams)
|
||||
++ ">/dev/null 2>/dev/null"
|
||||
_ <- liftIO $
|
||||
boolSystem "sh" [Param "-c", Param cmd]
|
||||
return ()
|
||||
liftIO $ boolSystem "sh" [Param "-c", Param cmd]
|
||||
|
|
|
@ -47,9 +47,8 @@ runHooks r starthook stophook a = do
|
|||
where
|
||||
remoteid = show (uuid r)
|
||||
run Nothing = return ()
|
||||
run (Just command) = liftIO $ do
|
||||
_ <- boolSystem "sh" [Param "-c", Param command]
|
||||
return ()
|
||||
run (Just command) = void $ liftIO $
|
||||
boolSystem "sh" [Param "-c", Param command]
|
||||
firstrun lck = do
|
||||
-- Take a shared lock; This indicates that git-annex
|
||||
-- is using the remote, and prevents other instances
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue