summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-16 21:06:33 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-16 21:06:33 -0400
commit9449328604e38fbba7ea5c02578e0f7e85f803d9 (patch)
treeba7016b72a9f32298beff5acf8caca421e8a9bbc
parent85531421f9fa726b59c37a3a5701ea9ca255d43d (diff)
Fix zombie cleanup reversion introduced in 3.20121009.
-rw-r--r--CmdLine.hs2
-rw-r--r--Command.hs8
-rw-r--r--debian/changelog6
3 files changed, 12 insertions, 4 deletions
diff --git a/CmdLine.hs b/CmdLine.hs
index a960886fe..331c363e4 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -21,7 +21,6 @@ import Common.Annex
import qualified Annex
import qualified Annex.Queue
import qualified Git
-import qualified Git.Command
import qualified Git.AutoCorrect
import Annex.Content
import Annex.Ssh
@@ -118,6 +117,5 @@ shutdown :: Bool -> Annex Bool
shutdown nocommit = do
saveState nocommit
sequence_ =<< M.elems <$> Annex.getState Annex.cleanup
- liftIO Git.Command.reap -- zombies from long-running git processes
sshCleanup -- ssh connection caching
return True
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. -}
diff --git a/debian/changelog b/debian/changelog
index 3274a3733..6e356d550 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (3.20121017) UNRELEASED; urgency=low
+
+ * Fix zombie cleanup reversion introduced in 3.20121009.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 16 Oct 2012 21:05:42 -0400
+
git-annex (3.20121016) unstable; urgency=low
* vicfg: New file format, avoids ambiguity with repos that have the same