Contain the zombie hordes.a

Specifically, when using gpg, a zombie is forked for each file, so waiting
until shutdown to reap won't do.

1 files changed, 3 insertions, 2 deletions

diff --git a/CmdLine.hs b/CmdLine.hs
index 4ccd2c2c2..0ee0c6adb 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -85,7 +85,9 @@ tryRun' :: Integer -> Annex.AnnexState -> [Annex Bool] -> IO ()
 tryRun' errnum state (a:as) = do
 	result <- try $ Annex.run state $ do
 		AnnexQueue.flushWhenFull
-		a
+		r <- a
+		liftIO Git.reap
+		return r
 	case result of
 		Left err -> do
 			Annex.eval state $ do
@@ -104,5 +106,4 @@ startup = return True
 shutdown :: Annex Bool
 shutdown = do
 	saveState
-	liftIO Git.reap
 	return True