diff options
author | 2016-05-23 17:27:15 -0400 | |
---|---|---|
committer | 2016-05-23 17:33:32 -0400 | |
commit | 9a8ff4c743fae057520caebb59a760caf29001b4 (patch) | |
tree | 6fb8bde572a73366a6749c07ecf711fe550a1bd5 /Remote/Bup.hs | |
parent | 063d84ddd33f1aa0624cf5f363f2c58397b98562 (diff) |
plumb RemoteGitConfig through to decryptCipher
Diffstat (limited to 'Remote/Bup.hs')
-rw-r--r-- | Remote/Bup.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index eda1950d3..06cce3d39 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -91,13 +91,13 @@ gen r u c gc = do } bupSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> RemoteGitConfig -> Annex (RemoteConfig, UUID) -bupSetup mu _ c _ = do +bupSetup mu _ c gc = do u <- maybe (liftIO genUUID) return mu -- verify configuration is sane let buprepo = fromMaybe (error "Specify buprepo=") $ M.lookup "buprepo" c - (c', _encsetup) <- encryptionSetup c + (c', _encsetup) <- encryptionSetup c gc -- bup init will create the repository. -- (If the repository already exists, bup init again appears safe.) |