mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build with old bytestring

Browse source 
bytestring-0.11.3.0 is the first to have ShortByteString singleton.
Unsure about what version added concat, but mconcat = concat.
This commit is contained in:
Joey Hess 2025-02-21 15:34:23 -04:00
parent 4c032655c2
commit c86142e22b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/Locations.hs
View file

@ -745,7 +745,7 @@ keyFile :: Key -> OsPath
keyFile k = keyFile k =
let b = serializeKey'' k let b = serializeKey'' k
in toOsPath $ if SB.any (`elem` needesc) b in toOsPath $ if SB.any (`elem` needesc) b
then SB.concat $ map esc (SB.unpack b) then mconcat $ map esc (SB.unpack b)
else b else b
where where
esc w = case chr (fromIntegral w) of esc w = case chr (fromIntegral w) of
@ -753,7 +753,7 @@ keyFile k =
'%' -> "&s" '%' -> "&s"
':' -> "&c" ':' -> "&c"
'/' -> "%" '/' -> "%"
_ -> SB.singleton w _ -> SB.pack [w]
needesc = map (fromIntegral . ord) ['&', '%', ':', '/'] needesc = map (fromIntegral . ord) ['&', '%', ':', '/']