etc-merge: Create directory in new_etc if deleted#1931
Merged
cgwalters merged 1 commit intobootc-dev:mainfrom Jan 21, 2026
Merged
etc-merge: Create directory in new_etc if deleted#1931cgwalters merged 1 commit intobootc-dev:mainfrom
cgwalters merged 1 commit intobootc-dev:mainfrom
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request fixes a panic that occurred when a directory modified in the current /etc was deleted in the new /etc. The changes correctly handle this case by adding the directory back to the diff. The function signatures for compute_diff and get_modifications have been updated to include the new /etc state, and call sites have been adjusted accordingly. I've found one area for improvement regarding how modified directories are added to the diff, which could lead to redundant processing. My feedback includes a suggestion to address this.
Johan-Liebert1
force-pushed
the
etc-merge-bugfix
branch
3 times, most recently
from
b20aa5b to
072a5f2
Compare
cgwalters
approved these changes
Jan 19, 2026
If a directory is modified/added in the current etc, but deleted in the new etc, we'd want it in the new etc. This case prior to this commit resulted in a panic as we were not taking it into account Fixes: bootc-dev#1924 Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Johan-Liebert1
force-pushed
the
etc-merge-bugfix
branch
from
072a5f2 to
474dbfb
Compare
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
2 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.
If a directory is modified/added in the current etc, but deleted in the new etc, we'd want it in the new etc. This case prior to this commit resulted in a panic as we were not taking it into account
Fixes: #1924