fix global_conf composition with profiles#18028
Merged
czoido merged 1 commit intoconan-io:develop2from Mar 27, 2025
Merged
Conversation
1 task
franramirez688
approved these changes
Mar 26, 2025
| self._pattern_confs[pattern] = conf | ||
|
|
||
| def rebase_conf_definition(self, other): | ||
| def rebase_conf_definition(self, global_conf): |
Contributor
There was a problem hiding this comment.
I think that using global_conf is a bit confusing. I prefer other instead. It's true that it will normally be the global_conf but itself is other ConfDefinition.
Member
Author
There was a problem hiding this comment.
I wanted to clearly define here that the only usage of this method is to be used for global_conf, for a very niche use-case. I have almost removed the rebase_conf_definition() and create a different name, or with a different scope, so it is only applied for global.conf when it has to be applied for it, because it is a bit confusing to have so many update_conf, compose_conf and rebase_conf methods.
czoido
approved these changes
Mar 27, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Changelog: Bugfix: Fix
global.confprecedence over profiles[conf]and order change of per-package pattern confs.Docs: Omit
Close #13439