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/Rsync.hs | |
| parent | 063d84ddd33f1aa0624cf5f363f2c58397b98562 (diff) | |
plumb RemoteGitConfig through to decryptCipher
Diffstat (limited to 'Remote/Rsync.hs')
| -rw-r--r-- | Remote/Rsync.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 28709bdab..8acf91214 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -138,12 +138,12 @@ rsyncTransport gc url fromNull as xs = if null xs then as else xs rsyncSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> RemoteGitConfig -> Annex (RemoteConfig, UUID) -rsyncSetup mu _ c _ = do +rsyncSetup mu _ c gc = do u <- maybe (liftIO genUUID) return mu -- verify configuration is sane let url = fromMaybe (error "Specify rsyncurl=") $ M.lookup "rsyncurl" c - (c', _encsetup) <- encryptionSetup c + (c', _encsetup) <- encryptionSetup c gc -- The rsyncurl is stored in git config, not only in this remote's -- persistant state, so it can vary between hosts. |