diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-05 11:54:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-05 11:54:59 -0400 |
| commit | ef2aa3fed1b6e9ed46f349a34bc52d114efe68fa (patch) | |
| tree | c119589f432f6fb80114a6f1302f9b462ef541f9 /Remote/S3.hs | |
| parent | 2afe50e60c319d71cdaef0efb832c88449751198 (diff) | |
improve info display of OtherStorageClass
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index d1c6dd3df..1635d22bb 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -604,7 +604,7 @@ s3Info c info = catMaybes [ Just ("bucket", fromMaybe "unknown" (getBucketName c)) , Just ("endpoint", w82s (S.unpack (S3.s3Endpoint s3c))) , Just ("port", show (S3.s3Port s3c)) - , Just ("storage class", show (getStorageClass c)) + , Just ("storage class", showstorageclass (getStorageClass c)) , if configIA c then Just ("internet archive item", iaItemUrl $ fromMaybe "unknown" $ getBucketName c) else Nothing @@ -613,6 +613,10 @@ s3Info c info = catMaybes ] where s3c = s3Configuration c +#if MIN_VERSION_aws(0,13,0) + showstorageclass (S3.OtherStorageClass t) = T.unpack t +#endif + showstorageclass sc = show sc getWebUrls :: S3Info -> Key -> Annex [URLString] getWebUrls info k = case (public info, getpublicurl info) of |