fix: config search order #2702
Merged
fix: config search order #2702
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes three problems: - the config order was wrong, global config was for some cases winning over local - move config file of tmp_pixi_workspace to correct folder - add a config reset for all tests so that our test run with a clean config
Hofer-Julian
force-pushed
the
fix/config-search-order
branch
from
93d6c98 to
87f420c
Compare
ruben-arts
reviewed
Dec 13, 2024
| pub fn merge_config(mut self, other: Config) -> Self { | ||
| self.mirrors.extend(other.mirrors); | ||
| self.loaded_from.extend(other.loaded_from); | ||
| pub fn merge_config(self, mut other: Config) -> Self { |
There was a problem hiding this comment.
This just flips all logic. Please make sure the logic stays correct over all calls. I'm assuming the only change required is in load()
Hofer-Julian
added a commit
to Hofer-Julian/rattler
that referenced
this pull request
Dec 13, 2024
That is needed for prefix-dev/pixi#2702
ruben-arts
approved these changes
Dec 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes three problems: