make everything build again after ByteString Key changes
This commit is contained in:
parent
151562b537
commit
727767e1e2
23 changed files with 79 additions and 72 deletions
4
Remote/External/Types.hs
vendored
4
Remote/External/Types.hs
vendored
|
@ -99,10 +99,10 @@ newtype SafeKey = SafeKey Key
|
|||
|
||||
mkSafeKey :: Key -> Either String SafeKey
|
||||
mkSafeKey k
|
||||
| any isSpace (keyName k) = Left $ concat
|
||||
| any isSpace (decodeBS $ keyName k) = Left $ concat
|
||||
[ "Sorry, this file cannot be stored on an external special remote because its key's name contains a space. "
|
||||
, "To avoid this problem, you can run: git-annex migrate --backend="
|
||||
, formatKeyVariety (keyVariety k)
|
||||
, decodeBS (formatKeyVariety (keyVariety k))
|
||||
, " and pass it the name of the file"
|
||||
]
|
||||
| otherwise = Right (SafeKey k)
|
||||
|
|
|
@ -208,5 +208,5 @@ adjustExportable r = case M.lookup "exporttree" (config r) of
|
|||
ea <- exportActions r
|
||||
retrieveExport ea k l dest p
|
||||
else do
|
||||
warning $ "exported content cannot be verified due to using the " ++ formatKeyVariety (keyVariety k) ++ " backend"
|
||||
warning $ "exported content cannot be verified due to using the " ++ decodeBS (formatKeyVariety (keyVariety k)) ++ " backend"
|
||||
return False
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue