diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-23 17:27:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-23 17:33:32 -0400 |
| commit | 9a8ff4c743fae057520caebb59a760caf29001b4 (patch) | |
| tree | 6fb8bde572a73366a6749c07ecf711fe550a1bd5 /Remote/Glacier.hs | |
| parent | 063d84ddd33f1aa0624cf5f363f2c58397b98562 (diff) | |
plumb RemoteGitConfig through to decryptCipher
Diffstat (limited to 'Remote/Glacier.hs')
| -rw-r--r-- | Remote/Glacier.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index 234b750d4..eae2dab68 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -84,7 +84,7 @@ glacierSetup mu mcreds c gc = do glacierSetup' (isJust mu) u mcreds c gc glacierSetup' :: Bool -> UUID -> Maybe CredPair -> RemoteConfig -> RemoteGitConfig -> Annex (RemoteConfig, UUID) glacierSetup' enabling u mcreds c gc = do - (c', encsetup) <- encryptionSetup c + (c', encsetup) <- encryptionSetup c gc c'' <- setRemoteCredPair encsetup c' gc (AWS.creds u) mcreds let fullconfig = c'' `M.union` defaults unless enabling $ @@ -288,7 +288,7 @@ jobList r keys = go =<< glacierEnv (config r) (gitconfig r) (uuid r) else do enckeys <- forM keys $ \k -> maybe k (\(_, enck) -> enck k) - <$> cipherKey (config r) + <$> cipherKey (config r) (gitconfig r) let keymap = M.fromList $ zip enckeys keys let convert = mapMaybe (`M.lookup` keymap) return (convert succeeded, convert failed) |