diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs index 2bd537c4e72..13dae49231c 100644 --- a/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs +++ b/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs @@ -266,8 +266,8 @@ parseSection programDb (MkSection (Name pos name) args secFields) remoteRepo <- lift $ parseFieldGrammar cabalSpec fields (remoteRepoGrammar repoName) remoteOrLocalRepo <- lift $ postProcessRemoteRepo pos remoteRepo case remoteOrLocalRepo of - Left local -> stateConfig . L.projectConfigShared %= (\pcs -> pcs{projectConfigLocalNoIndexRepos = (toNubList [local] <> projectConfigLocalNoIndexRepos pcs)}) - Right remote -> stateConfig . L.projectConfigShared %= (\pcs -> pcs{projectConfigRemoteRepos = (toNubList [remote] <> projectConfigRemoteRepos pcs)}) + Left local -> stateConfig . L.projectConfigShared %= (\pcs -> pcs{projectConfigLocalNoIndexRepos = (projectConfigLocalNoIndexRepos pcs <> toNubList [local])}) + Right remote -> stateConfig . L.projectConfigShared %= (\pcs -> pcs{projectConfigRemoteRepos = (projectConfigRemoteRepos pcs <> toNubList [remote])}) Nothing -> lift $ parseFailure pos "a 'repository' section requires the repository name as an argument" | name == "package" = do verifyNullSubsections diff --git a/cabal-testsuite/PackageTests/ProjectConfig/Parsec/cabal.test.hs b/cabal-testsuite/PackageTests/ProjectConfig/Parsec/cabal.test.hs index 78805bf9c5f..56cf68ca0b7 100644 --- a/cabal-testsuite/PackageTests/ProjectConfig/Parsec/cabal.test.hs +++ b/cabal-testsuite/PackageTests/ProjectConfig/Parsec/cabal.test.hs @@ -260,16 +260,16 @@ testRemoteRepos = do , remoteRepoURI = fromJust $ parseURI "http://packages.example.org/" , remoteRepoSecure = pure True , remoteRepoRootKeys = ["21", "42"] - , remoteRepoKeyThreshold = 123 + , remoteRepoKeyThreshold = 2 , remoteRepoShouldTryHttps = False } morePackagesRepository = RemoteRepo { remoteRepoName = RepoName $ "more-packages.example.org" , remoteRepoURI = fromJust $ parseURI "https://more-packages.example.org/" - , remoteRepoSecure = pure False + , remoteRepoSecure = pure True , remoteRepoRootKeys = ["foo", "bar"] - , remoteRepoKeyThreshold = 42 + , remoteRepoKeyThreshold = 1 , remoteRepoShouldTryHttps = False } secureLocalRepository = diff --git a/cabal-testsuite/PackageTests/ProjectConfig/Parsec/tests/remote-repos/cabal.project b/cabal-testsuite/PackageTests/ProjectConfig/Parsec/tests/remote-repos/cabal.project index 7767a4541f1..819af437b03 100644 --- a/cabal-testsuite/PackageTests/ProjectConfig/Parsec/tests/remote-repos/cabal.project +++ b/cabal-testsuite/PackageTests/ProjectConfig/Parsec/tests/remote-repos/cabal.project @@ -2,14 +2,14 @@ repository packages.example.org url: http://packages.example.org/ secure: True root-keys: 21, 42 - key-threshold: 123 + key-threshold: 2 repository more-packages.example.org url: https://more-packages.example.org/ - secure: False + secure: True root-keys: foo , bar - key-threshold: 42 + key-threshold: 1 repository my-secure-local-repository url: file:/path/to/secure/repo