diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-17 00:18:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-17 00:18:07 -0400 |
| commit | e8188ea611e4c9223492203c0ec0370c3c45b225 (patch) | |
| tree | 2a078993be28d1dedc38f8ab9ad193eea0ecf90e /Upgrade | |
| parent | ba744c84a4f683e50bf4c9b8c388e3a611f7fb91 (diff) | |
flip catchDefaultIO
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 3 | ||||
| -rw-r--r-- | Upgrade/V2.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index b2f2f38c1..36d06dc48 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -180,7 +180,8 @@ writeLog1 :: FilePath -> [LogLine] -> IO () writeLog1 file ls = viaTmp writeFile file (showLog ls) readLog1 :: FilePath -> IO [LogLine] -readLog1 file = catchDefaultIO (parseLog <$> readFileStrict file) [] +readLog1 file = catchDefaultIO [] $ + parseLog <$> readFileStrict file lookupFile1 :: FilePath -> Annex (Maybe (Key, Backend)) lookupFile1 file = do diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index c001bc5a9..1f4a40f3c 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -71,7 +71,7 @@ locationLogs = do files <- mapM tryDirContents (concat levelb) return $ mapMaybe islogfile (concat files) where - tryDirContents d = catchDefaultIO (dirContents d) [] + tryDirContents d = catchDefaultIO [] $ dirContents d islogfile f = maybe Nothing (\k -> Just (k, f)) $ logFileKey $ takeFileName f |