Fix display of unicode filenames.
Internally, the filenames are stored as un-decoded unicode. I tried decoding them, but then haskell tries to access the wrong files. Hmm. So, I've unhappily chosen option "B", which is to decode filenames before they are displayed.
This commit is contained in:
parent
e7a3475704
commit
fe55b4644e
11 changed files with 63 additions and 21 deletions
|
@ -193,14 +193,14 @@ checkKeyNumCopies key file numcopies = do
|
|||
|
||||
missingNote :: String -> Int -> Int -> String -> String
|
||||
missingNote file 0 _ [] =
|
||||
"** No known copies of " ++ file ++ " exist!"
|
||||
"** No known copies of " ++ showFile file ++ " exist!"
|
||||
missingNote file 0 _ untrusted =
|
||||
"Only these untrusted locations may have copies of " ++ file ++
|
||||
"Only these untrusted locations may have copies of " ++ showFile 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 " ++ file ++ " exist." ++
|
||||
" trustworthy copies of " ++ showFile file ++ " exist." ++
|
||||
"\nBack it up with git-annex copy."
|
||||
missingNote file present needed untrusted =
|
||||
missingNote file present needed [] ++
|
||||
|
|
|
@ -58,5 +58,5 @@ checkKeySHA1 key = do
|
|||
then return True
|
||||
else do
|
||||
dest <- moveBad key
|
||||
warning $ "Bad file content; moved to "++dest
|
||||
warning $ "Bad file content; moved to " ++ showFile dest
|
||||
return False
|
||||
|
|
|
@ -67,5 +67,5 @@ checkKeySize key = do
|
|||
then return True
|
||||
else do
|
||||
dest <- moveBad key
|
||||
warning $ "Bad file size; moved to "++dest
|
||||
warning $ "Bad file size; moved to " ++ showFile dest
|
||||
return False
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue