Skip to content

Commit 4c91314

Browse files
authored
fix sbom component bom-ref should not use has_special_root_node (#18515)
Changelog: Fix: SBOM component bom-ref should not use has_special_root_node Docs: omit Close: #18514
2 parents b2b22c1 + 49f45db commit 4c91314

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

conan/tools/sbom/cyclonedx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def cyclonedx_1_4(conanfile, name=None, add_build=False, add_tests=False, **kwar
5555
sbom_cyclonedx_1_4 = {
5656
**({"components": [{
5757
"author": node.conanfile.author or "Unknown",
58-
"bom-ref": special_id if has_special_root_node else f"pkg:conan/{node.name}@{node.ref.version}?rref={node.ref.revision}",
58+
"bom-ref": f"pkg:conan/{node.name}@{node.ref.version}?rref={node.ref.revision}",
5959
"description": node.conanfile.description,
6060
**({"externalReferences": [{
6161
"type": "website",
@@ -146,7 +146,7 @@ def cyclonedx_1_6(conanfile, name=None, add_build=False, add_tests=False, **kwar
146146
sbom_cyclonedx_1_6 = {
147147
**({"components": [{
148148
**({"authors": [{"name": node.conanfile.author}]} if node.conanfile.author else {}),
149-
"bom-ref": special_id if has_special_root_node else f"pkg:conan/{node.name}@{node.ref.version}?rref={node.ref.revision}",
149+
"bom-ref": f"pkg:conan/{node.name}@{node.ref.version}?rref={node.ref.revision}",
150150
"description": node.conanfile.description,
151151
**({"externalReferences": [{
152152
"type": "website",

0 commit comments

Comments
 (0)