aboutsummaryrefslogtreecommitdiff
path: root/Remote/S3.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 17:08:43 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 17:08:43 -0400
commit063d84ddd33f1aa0624cf5f363f2c58397b98562 (patch)
treec94f587d1338b5ab59bf44626c1d70915ec21134 /Remote/S3.hs
parentd5f672ddd59b43cb9b1bac8f836864165c8931f2 (diff)
plumb RemoteGitConfig through to setRemoteCredPair
Diffstat (limited to 'Remote/S3.hs')
-rw-r--r--Remote/S3.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs
index cf662c3d1..3ed46a2ad 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -124,7 +124,7 @@ s3Setup' new u mcreds c gc
defaulthost = do
(c', encsetup) <- encryptionSetup c
- c'' <- setRemoteCredPair encsetup c' (AWS.creds u) mcreds
+ c'' <- setRemoteCredPair encsetup c' gc (AWS.creds u) mcreds
let fullconfig = c'' `M.union` defaults
when new $
genBucket fullconfig gc u
@@ -132,7 +132,7 @@ s3Setup' new u mcreds c gc
archiveorg = do
showNote "Internet Archive mode"
- c' <- setRemoteCredPair noEncryptionUsed c (AWS.creds u) mcreds
+ c' <- setRemoteCredPair noEncryptionUsed c gc (AWS.creds u) mcreds
-- Ensure user enters a valid bucket name, since
-- this determines the name of the archive.org item.
let validbucket = replace " " "-" $