diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-17 10:42:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-17 10:42:14 -0400 |
| commit | 29826eaa3d217a722a291b30fba5f9eda98ff518 (patch) | |
| tree | d1458e3ddc08bf9cfac80650b15c40da5b5b6419 /Remote/S3.hs | |
| parent | 7b7d9ed864684aa3d82640780d69c5285750ab03 (diff) | |
refactor
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 1290e784a..fe407f204 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -39,6 +39,7 @@ import Config import Config.Cost import Remote.Helper.Special import Remote.Helper.Http +import Remote.Helper.Messages import qualified Remote.Helper.AWS as AWS import Creds import Annex.UUID @@ -269,7 +270,7 @@ remove info h k checkKey :: Remote -> S3Info -> Maybe S3Handle -> CheckPresent checkKey r info (Just h) k = do - showAction $ "checking " ++ name r + showChecking r #if MIN_VERSION_aws(0,10,0) rsp <- go return (isJust $ S3.horMetadata rsp) @@ -300,7 +301,7 @@ checkKey r info Nothing k = case getpublicurl info of warnMissingCredPairFor "S3" (AWS.creds $ uuid r) error "No S3 credentials configured" Just geturl -> do - showAction $ "checking " ++ name r + showChecking r withUrlOptions $ checkBoth (geturl k) (keySize k) {- Generate the bucket if it does not already exist, including creating the |