Fix zombie cleanup reversion introduced in 3.20121009.
This commit is contained in:
parent
053e72cbfa
commit
9200a02af5
3 changed files with 12 additions and 4 deletions
|
@ -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. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue