diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-04-21 23:04:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-04-21 23:06:19 -0400 |
| commit | bee420bd2d0cbe16489b061b208083e2b8ba9d0e (patch) | |
| tree | 70ef95f81ee411513da4b6343720480cd941c42c /Remote | |
| parent | be36aaca5bccecdff7e48b020ee62b0db3bc38f1 (diff) | |
in which I discover void
void :: Functor f => f a -> f () -- ah, of course that's useful :)
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 6 | ||||
| -rw-r--r-- | Remote/Helper/Hooks.hs | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 541b05099..d71872b27 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -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] diff --git a/Remote/Helper/Hooks.hs b/Remote/Helper/Hooks.hs index de731bd6e..40484b2a7 100644 --- a/Remote/Helper/Hooks.hs +++ b/Remote/Helper/Hooks.hs @@ -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 |