diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-08 16:44:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-08 16:44:00 -0400 |
| commit | a90a8d5a930ced3a2630a80560986e97dce6c1d1 (patch) | |
| tree | de6877a43841d1846544bdf959e86cd38effffca /Remote/S3.hs | |
| parent | 26aab67fea405186db6e3e5c84beceac4814f7e2 (diff) | |
don't show key urls in whereis for S3 with public=yes and exporttree=yes
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index f80a08bb2..c7b72def5 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -93,7 +93,7 @@ gen r u c gc = do , checkPresentExport = checkPresentExportS3 this info , renameExport = renameExportS3 this info } - , whereisKey = Just (getWebUrls info) + , whereisKey = Just (getWebUrls info c) , remoteFsck = Nothing , repairRepo = Nothing , config = c @@ -695,8 +695,10 @@ s3Info c info = catMaybes #endif showstorageclass sc = show sc -getWebUrls :: S3Info -> Key -> Annex [URLString] -getWebUrls info k = case (public info, getpublicurl info) of - (True, Just geturl) -> return [geturl k] - _ -> return [] +getWebUrls :: S3Info -> RemoteConfig -> Key -> Annex [URLString] +getWebUrls info c k + | exportTree c = return [] + | otherwise = case (public info, getpublicurl info) of + (True, Just geturl) -> return [geturl k] + _ -> return [] |