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

refactor

Browse source
This commit is contained in:
Joey Hess 2015-08-17 10:42:14 -04:00
parent 2ff22a383a
commit 1cd3b7ddf0
7 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Remote/S3.hs
View file

@ -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