diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-24 15:14:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-24 15:29:17 -0400 |
| commit | 278ac4da12315a90aededea02993c68924bb7a76 (patch) | |
| tree | 50d83dfadebee0e996d82c3678285e5a47c1da41 /Remote/S3.hs | |
| parent | ddc3612609e100f9230c7f1157948ebaf8b9685f (diff) | |
webapp: Fix creation of box.com, S3, and Glacier repositories, broken in 5.20140221.
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index b217892e7..c1a99abcd 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -76,9 +76,10 @@ gen r u c gc = new <$> remoteCost gc expensiveRemoteCost s3Setup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) s3Setup mu mcreds c = do u <- maybe (liftIO genUUID) return mu - s3Setup' u mcreds c -s3Setup' :: UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) -s3Setup' u mcreds c = if isIA c then archiveorg else defaulthost + c' <- setRemoteCredPair c (AWS.creds u) mcreds + s3Setup' u c' +s3Setup' :: UUID -> RemoteConfig -> Annex (RemoteConfig, UUID) +s3Setup' u c = if isIA c then archiveorg else defaulthost where remotename = fromJust (M.lookup "name" c) defbucket = remotename ++ "-" ++ fromUUID u @@ -92,8 +93,7 @@ s3Setup' u mcreds c = if isIA c then archiveorg else defaulthost use fullconfig = do gitConfigSpecialRemote u fullconfig "s3" "true" - c' <- setRemoteCredPair fullconfig (AWS.creds u) mcreds - return (c', u) + return (fullconfig, u) defaulthost = do c' <- encryptionSetup c |