internal/exec/stages/files: fix wrong map key in unit preset duplicate check - #2291
Open
vishnu2ko5 wants to merge 1 commit into
Open
internal/exec/stages/files: fix wrong map key in unit preset duplicate check#2291vishnu2ko5 wants to merge 1 commit into
vishnu2ko5 wants to merge 1 commit into
Conversation
…e check The duplicate check for systemd units incorrectly used the bare unit name rather than the suffixed key, effectively disabling duplicate detection and making the error path dead code.
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
1 participant
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.
What this PR does / why we need it:
This PR fixes a bug in the duplicate detection logic for systemd unit presets within the
filesstage.Previously, when checking if a unit was already present in the
presetsmap (to prevent conflicting enabled/disabled states for the same unit), the code incorrectly checkedpresets[unit.Name]instead of the dynamically constructedkey(which is formatted asunitName-enabledorunitName-disabled). Because the bare unit name never exists as a key in the map, the duplicate check always evaluated to false. This effectively disabled the conflict detection entirely and made the error return path dead code.This PR corrects the map lookup to use the proper
key, restoring the intended protection against duplicate/conflicting unit declarations.Fixes:
(Add the related issue number here if you opened an issue for this, e.g.,
Fixes #XYZ)Special notes for your reviewer:
presets[key]is properly scoped and correctly identifies duplicate entries matching thefmt.Sprintf("%s-%s", unit.Name, identifier)pattern.