support building with old version of bytestring
This commit is contained in:
parent
3dd41909dd
commit
de6e9f5beb
1 changed files with 8 additions and 1 deletions
|
@ -6,6 +6,7 @@
|
|||
-}
|
||||
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Annex.Locations (
|
||||
keyFile,
|
||||
|
@ -744,7 +745,7 @@ reSanitizeKeyName = preSanitizeKeyName' True
|
|||
keyFile :: Key -> OsPath
|
||||
keyFile k =
|
||||
let b = serializeKey'' k
|
||||
in toOsPath $ if SB.any (`elem` needesc) b
|
||||
in toOsPath $ if anyneedesc b
|
||||
then mconcat $ map esc (SB.unpack b)
|
||||
else b
|
||||
where
|
||||
|
@ -757,6 +758,12 @@ keyFile k =
|
|||
|
||||
needesc = map (fromIntegral . ord) ['&', '%', ':', '/']
|
||||
|
||||
#if MIN_VERSION_bytestring(0,11,3)
|
||||
anyneedesc = SB.any (`elem` needesc)
|
||||
#else
|
||||
anyneedesc = any (`elem` needesc) . SB.unpack
|
||||
#endif
|
||||
|
||||
{- Reverses keyFile, converting a filename fragment (ie, the basename of
|
||||
- the symlink target) into a key. -}
|
||||
fileKey :: OsPath -> Maybe Key
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue