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

attempt at a quick, utf-8 only fix to the ghc 7.4 problem

Browse source 
If you have only utf-8 filenames, and need to build git-annex with ghc 7.4,
this will work. But, it will crash on non-utf-8 filenames.
This commit is contained in:
Joey Hess 2012-02-01 16:05:02 -04:00
parent 6c64a214fa
commit 3d49258e5b
9 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Unused.hs
View file

@ -10,7 +10,8 @@
module Command.Unused where
import qualified Data.Set as S
import qualified Data.ByteString.Lazy.Char8 as L
import qualified Data.Text.Lazy as L
import qualified Data.Text.Lazy.Encoding as L
import Common.Annex
import Command
@ -202,7 +203,7 @@ getKeysReferencedInGit ref = do
findkeys c [] = return c
findkeys c (l:ls)
| isSymLink (LsTree.mode l) = do
content <- catFile ref $ LsTree.file l
content <- L.decodeUtf8 <$> catFile ref (LsTree.file l)
case fileKey (takeFileName $ L.unpack content) of
Nothing -> findkeys c ls
Just k -> findkeys (k:c) ls