rename isIA to configIA

Already done on s3-aws branch, so reduce divergence.
This commit is contained in:
Joey Hess 2014-10-23 15:56:35 -04:00
parent a1fb1b7ae3
commit fa1318479e
4 changed files with 11 additions and 11 deletions

View file

@ -162,7 +162,7 @@ getEnableS3R :: UUID -> Handler Html
#ifdef WITH_S3
getEnableS3R uuid = do
m <- liftAnnex readRemoteLog
if maybe False S3.isIA (M.lookup uuid m)
if maybe False S3.confgiIA (M.lookup uuid m)
then redirect $ EnableIAR uuid
else postEnableS3R uuid
#else
@ -224,5 +224,5 @@ previouslyUsedAWSCreds :: Annex (Maybe CredPair)
previouslyUsedAWSCreds = getM gettype [S3.remote, Glacier.remote]
where
gettype t = previouslyUsedCredPair AWS.creds t $
not . S3.isIA . Remote.config
not . S3.configIA . Remote.config
#endif

View file

@ -239,7 +239,7 @@ getRepoInfo :: Maybe Remote.Remote -> Maybe Remote.RemoteConfig -> Widget
getRepoInfo (Just r) (Just c) = case M.lookup "type" c of
Just "S3"
#ifdef WITH_S3
| S3.isIA c -> IA.getRepoInfo c
| S3.configIA c -> IA.getRepoInfo c
#endif
| otherwise -> AWS.getRepoInfo c
Just t

View file

@ -107,7 +107,7 @@ iaCredsAForm defcreds = AWS.AWSCreds
#ifdef WITH_S3
previouslyUsedIACreds :: Annex (Maybe CredPair)
previouslyUsedIACreds = previouslyUsedCredPair AWS.creds S3.remote $
S3.isIA . Remote.config
S3.configIA . Remote.config
#endif
accessKeyIDFieldWithHelp :: Maybe Text -> MkAForm Text