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

don't show key urls in whereis for S3 with public=yes and exporttree=yes

Browse source
This commit is contained in:
Joey Hess 2017-09-08 16:44:00 -04:00
parent 0228714406
commit afdff226fb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Remote/Helper/Export.hs
View file

@ -37,6 +37,11 @@ instance HasExportUnsupported (ExportActions Annex) where
, renameExport = \_ _ _ -> return False
}
exportTree :: RemoteConfig -> Bool
exportTree c = case M.lookup "exporttree" c of
Just "yes" -> True
_ -> False
exportIsSupported :: RemoteConfig -> RemoteGitConfig -> Annex Bool
exportIsSupported = \_ _ -> return True
@ -49,17 +54,17 @@ adjustExportableRemoteType rt = rt { setup = setup' }
let cont = setup rt st mu cp c gc
ifM (exportSupported rt c gc)
( case st of
Init -> case M.lookup "exporttree" c of
Just "yes" | isEncrypted c ->
Init
| exportTree c && isEncrypted c ->
giveup "cannot enable both encryption and exporttree"
_ -> cont
| otherwise -> cont
Enable oldc
| M.lookup "exporttree" c /= M.lookup "exporttree" oldc ->
| exportTree c /= exportTree oldc ->
giveup "cannot change exporttree of existing special remote"
| otherwise -> cont
, case M.lookup "exporttree" c of
Just "yes" -> giveup "exporttree=yes is not supported by this special remote"
_ -> cont
, if exportTree c
then giveup "exporttree=yes is not supported by this special remote"
else cont
)
-- | If the remote is exportSupported, and exporttree=yes, adjust the