mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build warning with ghc 7.10

Browse source
This commit is contained in:
Joey Hess 2015-05-10 15:28:13 -04:00
parent a5a53ca011
commit 08308dc9b3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/Content.hs
View file

@ -500,9 +500,9 @@ getKeysPresent keyloc = do
direct <- isDirect direct <- isDirect
dir <- fromRepo gitAnnexObjectDir dir <- fromRepo gitAnnexObjectDir
s <- getstate direct s <- getstate direct
liftIO $ traverse s direct (2 :: Int) dir liftIO $ walk s direct (2 :: Int) dir
where where
traverse s direct depth dir = do walk s direct depth dir = do
contents <- catchDefaultIO [] (dirContents dir) contents <- catchDefaultIO [] (dirContents dir)
if depth == 0 if depth == 0
then do then do
@ -510,7 +510,7 @@ getKeysPresent keyloc = do
let keys = mapMaybe (fileKey . takeFileName) contents' let keys = mapMaybe (fileKey . takeFileName) contents'
continue keys [] continue keys []
else do else do
let deeper = traverse s direct (depth - 1) let deeper = walk s direct (depth - 1)
continue [] (map deeper contents) continue [] (map deeper contents)
continue keys [] = return keys continue keys [] = return keys
continue keys (a:as) = do continue keys (a:as) = do