summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CmdLine.hs5
-rw-r--r--debian/changelog1
2 files changed, 4 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
diff --git a/debian/changelog b/debian/changelog
index bf41f553d..834d2a572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ git-annex (3.20110929) UNRELEASED; urgency=low
* status: List all known repositories.
* When displaying a list of repositories, show git remote names
in addition to their descriptions.
+ * Contain the zombie hordes.
-- Joey Hess <joeyh@debian.org> Thu, 29 Sep 2011 18:58:53 -0400