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

make everything build again after ByteString Key changes

Browse source
This commit is contained in:
Joey Hess 2019-01-11 16:34:04 -04:00
parent 151562b537
commit 727767e1e2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
23 changed files with 79 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Backend/WORM.hs
View file

@ -14,6 +14,8 @@ import Types.KeySource
import Backend.Utilities
import Git.FilePath
import qualified Data.ByteString.Char8 as S8
backends :: [Backend]
backends = [backend]
@ -45,12 +47,12 @@ keyValue source = do
{- Old WORM keys could contain spaces, and can be upgraded to remove them. -}
needsUpgrade :: Key -> Bool
needsUpgrade key = ' ' `elem` keyName key
needsUpgrade key = ' ' `S8.elem` keyName key
removeSpaces :: Key -> Backend -> AssociatedFile -> Annex (Maybe Key)
removeSpaces oldkey newbackend _
| migratable = return $ Just $ oldkey
{ keyName = reSanitizeKeyName (keyName oldkey) }
{ keyName = encodeBS $ reSanitizeKeyName $ decodeBS $ keyName oldkey }
| otherwise = return Nothing
where
migratable = oldvariety == newvariety