diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-02-11 15:37:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-02-11 15:37:37 -0400 |
| commit | 5a50a7cf137997a9d940b9a89a0968452a1ac411 (patch) | |
| tree | 64ac76dc4a4327a2b3eafbee28c45670af71340f /Backend/File.hs | |
| parent | 285fb2bb08c7da534c111ebfeee5911e850570cc (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 'Backend/File.hs')
| -rw-r--r-- | Backend/File.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Backend/File.hs b/Backend/File.hs index fca385a1e..d5691595a 100644 --- a/Backend/File.hs +++ b/Backend/File.hs @@ -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 [] ++ |