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

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

2
Remote/Glacier.hs
View file

@ -85,7 +85,7 @@ glacierSetup mu mcreds c gc = do
glacierSetup' :: Bool -> UUID -> Maybe CredPair -> RemoteConfig -> RemoteGitConfig -> Annex (RemoteConfig, UUID)
glacierSetup' enabling u mcreds c gc = 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
unless enabling $
genVault fullconfig gc u