Skip to content

Always check the current lists before inserting on blueprints#2283

Merged
evgenyz merged 1 commit intoOpenSCAP:mainfrom
Mab879:fix_2282
Dec 5, 2025
Merged

Always check the current lists before inserting on blueprints#2283
evgenyz merged 1 commit intoOpenSCAP:mainfrom
Mab879:fix_2282

Conversation

@Mab879
Copy link
Copy Markdown
Member

@Mab879 Mab879 commented Dec 3, 2025

Fixes #2282

@Mab879 Mab879 modified the milestones: 1.4.3, 1.4.4 Dec 3, 2025
@Mab879 Mab879 force-pushed the fix_2282 branch 2 times, most recently from 463938d to e88f865 Compare December 4, 2025 22:05
Comment thread tests/API/XCCDF/unittests/test_duplicate_blueprint_service.toml Outdated
Comment thread tests/API/XCCDF/unittests/test_remediation_blueprint.toml
@evgenyz
Copy link
Copy Markdown
Contributor

evgenyz commented Dec 5, 2025

Okay, I believe that you over-complicated things. In order to get the desired behavior you just have to duplicate <Rule selected="true" id="xccdf_moc.elpmaxe.www_rule_9"> in the existing test (test_remediation_blueprint.xccdf.xml DS) and that's it.

With that backporting the change will be super simple.

@evgenyz
Copy link
Copy Markdown
Contributor

evgenyz commented Dec 5, 2025

The 205 - probes/fwupdsecattr/test_probes_fwupdsecattr_mock.sh (Failed) failure on Ubuntu is irrelevant to the PR changes.

@evgenyz evgenyz merged commit dd31572 into OpenSCAP:main Dec 5, 2025
16 of 17 checks passed
@Mab879 Mab879 deleted the fix_2282 branch December 5, 2025 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Blueprints do not correctly deduplicate

2 participants