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
This commit is contained in:
Joey Hess 2011-02-11 15:37:37 -04:00
parent 285fb2bb08
commit 5a50a7cf13
11 changed files with 34 additions and 16 deletions

View file

@ -193,14 +193,14 @@ checkKeyNumCopies key file numcopies = do
missingNote :: String -> Int -> Int -> String -> String
missingNote file 0 _ [] =
"** No known copies of " ++ showFile file ++ " exist!"
"** No known copies of " ++ filePathToString file ++ " exist!"
missingNote file 0 _ untrusted =
"Only these untrusted locations may have copies of " ++ showFile file ++
"Only these untrusted locations may have copies of " ++ filePathToString file ++
"\n" ++ untrusted ++
"Back it up to trusted locations with git-annex copy."
missingNote file present needed [] =
"Only " ++ show present ++ " of " ++ show needed ++
" trustworthy copies of " ++ showFile file ++ " exist." ++
" trustworthy copies of " ++ filePathToString file ++ " exist." ++
"\nBack it up with git-annex copy."
missingNote file present needed untrusted =
missingNote file present needed [] ++