From 184a69171d5d983ee2f08cce28011d235f44cc5c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Mar 2012 01:59:07 -0400 Subject: removed another 10 lines via ifM --- Upgrade/V0.hs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Upgrade/V0.hs') diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs index c439c7caa..8f3af337e 100644 --- a/Upgrade/V0.hs +++ b/Upgrade/V0.hs @@ -35,14 +35,11 @@ lookupFile0 :: FilePath -> Annex (Maybe (Key, Backend)) lookupFile0 = Upgrade.V1.lookupFile1 getKeysPresent0 :: FilePath -> Annex [Key] -getKeysPresent0 dir = do - exists <- liftIO $ doesDirectoryExist dir - if not exists - then return [] - else do - contents <- liftIO $ getDirectoryContents dir - files <- liftIO $ filterM present contents - return $ map fileKey0 files +getKeysPresent0 dir = ifM (liftIO $ doesDirectoryExist dir) + ( liftIO $ map fileKey0 + <$> (filterM present =<< getDirectoryContents dir) + , return [] + ) where present d = do result <- tryIO $ -- cgit v1.2.3