CFE-4561: Implemented support for converting modified files into patch files in cfbs-convert#289
Merged
larsewi merged 9 commits intocfengine:masterfrom Nov 18, 2025
Merged
Conversation
…e helper function This improved how the program messages read (especially when in interactive mode, where there will be a prompt about editing the commit message) and reduced code verbosity. Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
|
Thank you for submitting a PR! Maybe @larsewi can review this? |
larsewi
reviewed
Nov 18, 2025
|
|
||
|
|
||
| def _apply_masterfiles_patch(patch_path): | ||
| if not cli_tool_present("patch"): |
Contributor
There was a problem hiding this comment.
This function could take a list of commands. You should check for gpatch first, to ensure GNU implementation. Some UNIX systems have their own implementation of patch which can behave differently.
Contributor
There was a problem hiding this comment.
We only bundle cfbs in hub packages as far as I know. And they are all Linux. So should be fine to not do this.
| # make the patches local module on first use | ||
| if not patches_module_present: | ||
| print("Adding patches local module...") | ||
| mkdir(patches_dir) |
Contributor
There was a problem hiding this comment.
Should probably not error in case of FileExistsError
Contributor
Author
There was a problem hiding this comment.
That directory can't exist due to
Lines 1138 to 1141 in 3f602d9
…the system Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
… a unified diff Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
… cfbs-convert Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
…st file converted to a patch file Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
…e conversion together This makes sense since a module with no build steps is not considered valid. Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
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.
No description provided.