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/Directory.hs | |
| parent | 063d84ddd33f1aa0624cf5f363f2c58397b98562 (diff) | |
plumb RemoteGitConfig through to decryptCipher
Diffstat (limited to 'Remote/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index d7c5696a9..3b26947b6 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -78,7 +78,7 @@ gen r u c gc = do dir = fromMaybe (error "missing directory") $ remoteAnnexDirectory gc directorySetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> RemoteGitConfig -> Annex (RemoteConfig, UUID) -directorySetup mu _ c _ = do +directorySetup mu _ c gc = do u <- maybe (liftIO genUUID) return mu -- verify configuration is sane let dir = fromMaybe (error "Specify directory=") $ @@ -86,7 +86,7 @@ directorySetup mu _ c _ = do absdir <- liftIO $ absPath dir liftIO $ unlessM (doesDirectoryExist absdir) $ error $ "Directory does not exist: " ++ absdir - (c', _encsetup) <- encryptionSetup c + (c', _encsetup) <- encryptionSetup c gc -- The directory is stored in git config, not in this remote's -- persistant state, so it can vary between hosts. |