Always indicate when patches are applied (#14165) #14177
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
reviewed
Jun 27, 2023
| @@ -39,7 +39,7 @@ def patch(conanfile, base_path=None, patch_file=None, patch_string=None, strip=0 | |||
| :param kwargs: Extra parameters that can be added and will contribute to output information | |||
| """ | |||
|
|
|||
| patch_type = kwargs.get('patch_type') | |||
| patch_type = kwargs.get('patch_type') or ("file" if patch_file else "string") | |||
There was a problem hiding this comment.
It seems this could be breaking the tests, other types like "backport" are being ovewrritten?
https://ci.conan.io/blue/organizations/jenkins/ConanTestSuitev2/detail/PR-14177/1/pipeline/9
There was a problem hiding this comment.
It should respect any non-empty value of patch_type that gets passed in. I'm not familiar with the test output conventions, but isn't it complaining about the new/modified "Apply patch (file)" lines?
Remember, the old behavior was that patch_file without (patch_type or patch_description) printed nothing, and patch_type could be left unset and e.g. "(file)" would not be printed.
Also update test_patches.py accordingly.
iskunk
force-pushed
the
feature/apply-patches-verbose
branch
from
38a2252 to
cb5fd1f
Compare
memsharded
approved these changes
Jun 28, 2023
|
Fantastic, many thanks for your contribution! Merged, it will be next 2.0.8 |
1 task
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.
Changelog: Fix: Enable existing status-message code in the
patch()function.Docs: Omit
Close #14165
developbranch, documenting this one.