[develop2] Fix bug in override=True trait propagation
#10624
Merged
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
memsharded
commented
Feb 21, 2022
| @@ -212,6 +212,8 @@ def aggregate(self, other): | |||
| self.libs |= other.libs | |||
| self.run = self.run or other.run | |||
| self.visible |= other.visible | |||
| # The force trait is also defined from an override | |||
| self.force |= other.force or other.override | |||
There was a problem hiding this comment.
This is the core fix of this PR, the rests are tests, output and removing dead code
memsharded
commented
Feb 21, 2022
| @@ -58,4 +58,4 @@ def get(self, *args, **kwargs): | |||
| requester_class=BuggyRequester) | |||
| client.run("install --reference=pkg/0.1@lasote/stable", assert_error=True) | |||
| self.assertEqual(str(client.out).count("Waiting 0 seconds to retry..."), 2) | |||
| self.assertEqual(str(client.out).count("Error 200 downloading"), 3) | |||
| self.assertEqual(str(client.out).count("Error 200 downloading"), 4) | |||
There was a problem hiding this comment.
This increments by 1 because the detailed information about the Graph error includes the error downloading message.
czoido
approved these changes
Feb 22, 2022
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 is necessary for the 2.0 docs and conan-io/examples2#2