summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Committer.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Assistant/Threads/Committer.hs')
-rw-r--r--Assistant/Threads/Committer.hs9
1 files changed, 3 insertions, 6 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index bee359d59..727b85840 100644
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -297,13 +297,10 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do
removedKeysMap ct l = do
mks <- forM (filter isRmChange l) $ \c ->
catKeyFile $ changeFile c
- M.fromList . catMaybes <$> forM (catMaybes mks) mkpair
+ M.fromList . concat <$> mapM mkpairs (catMaybes mks)
where
- mkpair k = do
- mcache <- recordedInodeCache k
- case mcache of
- Just cache -> return $ Just (inodeCacheToKey ct cache, k)
- Nothing -> return Nothing
+ mkpairs k = map (\c -> (inodeCacheToKey ct c, k)) <$>
+ recordedInodeCache k
failedingest = do
liftAnnex showEndFail