aboutsummaryrefslogtreecommitdiff
path: root/Upgrade
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-04 19:56:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-04 19:56:32 -0400
commitcd699ff50b8434b52e2f51d06414e8431b407482 (patch)
tree77291f6d6f6c340c41f9da5b3bbfeae4117d7764 /Upgrade
parentbdbfe36e945e97d66c965bc7227d1457372bce32 (diff)
fix last zombies in the assistant
Made Git.LsFiles return cleanup actions, and everything waits on processes now, except of course for Seek.
Diffstat (limited to 'Upgrade')
-rw-r--r--Upgrade/V1.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 36d06dc48..8f7de3950 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -83,8 +83,9 @@ updateSymlinks :: Annex ()
updateSymlinks = do
showAction "updating symlinks"
top <- fromRepo Git.repoPath
- files <- inRepo $ LsFiles.inRepo [top]
+ (files, cleanup) <- inRepo $ LsFiles.inRepo [top]
forM_ files fixlink
+ void $ liftIO cleanup
where
fixlink f = do
r <- lookupFile1 f