summaryrefslogtreecommitdiff
path: root/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-02-11 15:37:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-02-11 15:37:37 -0400
commit5a50a7cf137997a9d940b9a89a0968452a1ac411 (patch)
tree64ac76dc4a4327a2b3eafbee28c45670af71340f /Content.hs
parent285fb2bb08c7da534c111ebfeee5911e850570cc (diff)
update unicode FilePath handling
Based on http://hackage.haskell.org/trac/ghc/ticket/3307 , whether FilePath contains decoded unicode varies by OS. So, add a configure check for it. Also, renamed showFile to filePathToString
Diffstat (limited to 'Content.hs')
-rw-r--r--Content.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Content.hs b/Content.hs
index 188a38787..345599dba 100644
--- a/Content.hs
+++ b/Content.hs
@@ -50,7 +50,7 @@ calcGitLink file key = do
cwd <- liftIO $ getCurrentDirectory
let absfile = case absNormPath cwd file of
Just f -> f
- Nothing -> error $ "unable to normalize " ++ showFile file
+ Nothing -> error $ "unable to normalize " ++ filePathToString file
return $ relPathDirToDir (parentDir absfile) (Git.workTree g) ++
annexLocation key