diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-02-01 16:05:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-02-01 16:16:08 -0400 |
| commit | 3d49258e5bed4d9a6ec9e24ddb776f277542664b (patch) | |
| tree | 89af32cbdde6a5e672c357c24fe281337e2a133a /Command/Unused.hs | |
| parent | 6c64a214fa569dcf1fa8cc4c79efd90d01ff5705 (diff) | |
attempt at a quick, utf-8 only fix to the ghc 7.4 problem
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.
Diffstat (limited to 'Command/Unused.hs')
| -rw-r--r-- | Command/Unused.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs index ffd4bef45..67f743ab0 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -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 |