diff options
author | Joey Hess <joey@kitenet.net> | 2012-10-16 21:06:33 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-10-16 21:06:33 -0400 |
commit | 9449328604e38fbba7ea5c02578e0f7e85f803d9 (patch) | |
tree | ba7016b72a9f32298beff5acf8caca421e8a9bbc /Command.hs | |
parent | 85531421f9fa726b59c37a3a5701ea9ca255d43d (diff) |
Fix zombie cleanup reversion introduced in 3.20121009.
Diffstat (limited to 'Command.hs')
-rw-r--r-- | Command.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Command.hs b/Command.hs index 8e7bf9758..145ad5003 100644 --- a/Command.hs +++ b/Command.hs @@ -39,6 +39,7 @@ import Usage as ReExported import Logs.Trust import Config import Annex.CheckAttr +import qualified Git.Command {- Generates a normal command -} command :: String -> String -> [CommandSeek] -> String -> Command @@ -83,11 +84,14 @@ doCommand = start where start = stage $ maybe skip perform perform = stage $ maybe failure cleanup - cleanup = stage $ status + cleanup = stage $ end stage = (=<<) skip = return True failure = showEndFail >> return False - status r = showEndResult r >> return r + end r = do + -- zombies from long-running git processes + liftIO Git.Command.reap + showEndResult r >> return r {- Modifies an action to only act on files that are already annexed, - and passes the key and backend on to it. -} |