diff --git a/Backend.hs b/Backend.hs index 3a00115368..1c6bc80e06 100644 --- a/Backend.hs +++ b/Backend.hs @@ -62,17 +62,9 @@ genKey source meterupdate preferredbackend = do case B.genKey b of Just a -> do k <- a source meterupdate - return (makesane k, b) + return (k, b) Nothing -> giveup $ "Cannot generate a key for backend " ++ decodeBS (formatKeyVariety (B.backendVariety b)) - where - -- keyNames should not contain newline characters. - makesane k = alterKey k $ \d -> d - { keyName = S.toShort (S8.map fixbadchar (S.fromShort (fromKey keyName k))) - } - fixbadchar c - | c == '\n' = '_' - | otherwise = c getBackend :: FilePath -> Key -> Annex (Maybe Backend) getBackend file k = maybeLookupBackendVariety (fromKey keyVariety k) >>= \case