Correctly ignore patches that are already applied. #20480
Merged
Conversation
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
github-actions
bot
added
the
area/packaging
There was a problem hiding this comment.
Pull Request Overview
This PR modifies the patching script to ignore patches that have already been applied instead of causing the process to fail.
- Added the --forward flag to the patch command.
- Captured the patch command's exit code and conditionally exited only for errors other than already applied patches.
Comments suppressed due to low confidence (1)
packaging/cmake/patches/apply-patches.sh:10
- [nitpick] Consider renaming 'ret' to 'exit_status' to improve readability by clearly indicating that it holds the exit code.
ret="${?}"
ilyam8
approved these changes
Jun 13, 2025
stelfrag
pushed a commit
to stelfrag/netdata
that referenced
this pull request
Jun 16, 2025
(cherry picked from commit ade0e5b)
Merged
Ferroin
added a commit
to stelfrag/netdata
that referenced
this pull request
Jun 24, 2025
(cherry picked from commit ade0e5b)
Ferroin
added a commit
that referenced
this pull request
Jun 24, 2025
(cherry picked from commit ade0e5b)
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.
Summary
When trying to process a patch that has already been applied,
patchwill return a non-zero exit code. Additionally, there is no option to override this behavior and simply ignore patches that are already applied.Given this, restructure our patching script so that it just ignores patches that have already been applied, since we obviously don’t need to apply them.
Test Plan
Requires testing to confirm the change is working.