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

plumb RemoteGitConfig through to setRemoteCredPair

Browse source
This commit is contained in:
Joey Hess 2016-05-23 17:08:43 -04:00
parent 91df4c6b53
commit 22c174158c
Failed to extract signature
5 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Remote/S3.hs
View file

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