diff options
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V0.hs | 4 | ||||
| -rw-r--r-- | Upgrade/V1.hs | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs index c5310c641..c439c7caa 100644 --- a/Upgrade/V0.hs +++ b/Upgrade/V0.hs @@ -7,8 +7,6 @@ module Upgrade.V0 where -import System.IO.Error (try) - import Common.Annex import Annex.Content import qualified Upgrade.V1 @@ -47,7 +45,7 @@ getKeysPresent0 dir = do return $ map fileKey0 files where present d = do - result <- try $ + result <- tryIO $ getFileStatus $ dir ++ "/" ++ takeFileName d case result of Right s -> return $ isRegularFile s diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index add50fcf3..ca2bff661 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -7,7 +7,6 @@ module Upgrade.V1 where -import System.IO.Error (try) import System.Posix.Types import Data.Char @@ -183,7 +182,7 @@ readLog1 file = catchDefaultIO (parseLog <$> readFileStrict file) [] lookupFile1 :: FilePath -> Annex (Maybe (Key, Backend)) lookupFile1 file = do - tl <- liftIO $ try getsymlink + tl <- liftIO $ tryIO getsymlink case tl of Left _ -> return Nothing Right l -> makekey l @@ -216,7 +215,7 @@ getKeyFilesPresent1' dir = do liftIO $ filterM present files where present f = do - result <- try $ getFileStatus f + result <- tryIO $ getFileStatus f case result of Right s -> return $ isRegularFile s Left _ -> return False |