Rethink filename encoding handling for display. Since filename encoding may or may not match locale settings, any attempt to decode filenames will fail for some files. So instead, do all output in binary mode.0.23

3 files changed, 5 insertions, 5 deletions

diff --git a/Backend/File.hs b/Backend/File.hs
index d5691595a..d76cd2939 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 " ++ filePathToString file ++ " exist!"
+		"** No known copies of " ++ file ++ " exist!"
 missingNote file 0 _ untrusted =
-		"Only these untrusted locations may have copies of " ++ filePathToString file ++
+		"Only these untrusted locations may have copies of " ++ 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 " ++ filePathToString file ++ " exist." ++
+		" trustworthy copies of " ++ file ++ " exist." ++
 		"\nBack it up with git-annex copy."
 missingNote file present needed untrusted = 
 		missingNote file present needed [] ++
diff --git a/Backend/SHA.hs b/Backend/SHA.hs
index c074ab48a..4eea890ce 100644
--- a/Backend/SHA.hs
+++ b/Backend/SHA.hs
@@ -83,5 +83,5 @@ checkKeyChecksum size key = do
 				then return True
 				else do
 					dest <- moveBad key
-					warning $ "Bad file content; moved to " ++ filePathToString dest
+					warning $ "Bad file content; moved to " ++ dest
 					return False
diff --git a/Backend/WORM.hs b/Backend/WORM.hs
index 8a6412eb1..a0d814aa0 100644
--- a/Backend/WORM.hs
+++ b/Backend/WORM.hs
@@ -70,5 +70,5 @@ checkKeySize key = do
 				then return True
 				else do
 					dest <- moveBad key
-					warning $ "Bad file size; moved to " ++ filePathToString dest
+					warning $ "Bad file size; moved to " ++ dest
 					return False