eliminate s2w8 and w82s

Note that the use of s2w8 in genUUIDInNameSpace made it truncate unicode
characters. Luckily, genUUIDInNameSpace is only ever used on ASCII
strings as far as I can determine. In particular, git-remote-gcrypt's
gcrypt-id is an ASCII string.
This commit is contained in:
Joey Hess 2023-10-26 13:12:57 -04:00
parent 3742263c99
commit c873586e14
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 10 additions and 25 deletions

View file

@ -319,7 +319,7 @@ testServer sshinput@(SshInput { inputHostname = Just hn }) = do
finduuid (k, v)
| k == "annex.uuid" = Just $ toUUID v
| k == fromConfigKey GCrypt.coreGCryptId =
Just $ genUUIDInNameSpace gCryptNameSpace v
Just $ genUUIDInNameSpace gCryptNameSpace (encodeBS v)
| otherwise = Nothing
checkcommand c = "if which " ++ c ++ "; then " ++ report c ++ "; fi"