This is an automated email from the ASF dual-hosted git repository.
arm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new 2facb5c Fix a couple of bugs in the SBOM report augment section
2facb5c is described below
commit 2facb5cafc1783ec0e7ac26ed14eff9b364a8b26
Author: Alastair McFarlane <[email protected]>
AuthorDate: Mon Dec 22 09:50:18 2025 +0000
Fix a couple of bugs in the SBOM report augment section
---
atr/get/sbom.py | 8 +++++---
atr/storage/writers/sbom.py | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/atr/get/sbom.py b/atr/get/sbom.py
index 71c92fd..8f73db3 100644
--- a/atr/get/sbom.py
+++ b/atr/get/sbom.py
@@ -105,9 +105,11 @@ async def report(session: web.Committer, project: str,
version: str, file_path:
if len(augment_tasks) > 0:
latest_augment = augment_tasks[0]
augment_results: list[Any] = [t.result for t in augment_tasks]
- last_augmented_bom = max(
- [r.bom_version for r in augment_results if r is not None and
r.bom_version is not None]
- )
+ augmented_bom_versions = [
+ r.bom_version for r in augment_results if r is not None and
r.bom_version is not None
+ ]
+ if len(augmented_bom_versions) > 0:
+ last_augmented_bom = max(augmented_bom_versions)
_augment_section(block, release, task_result, latest_augment,
last_augmented_bom)
_conformance_section(block, task_result)
diff --git a/atr/storage/writers/sbom.py b/atr/storage/writers/sbom.py
index a18e5e9..7745cb7 100644
--- a/atr/storage/writers/sbom.py
+++ b/atr/storage/writers/sbom.py
@@ -96,6 +96,7 @@ class CommitteeParticipant(FoundationCommitter):
project_name=project_name,
version_name=version_name,
revision_number=revision_number,
+ primary_rel_path=str(rel_path),
)
self.__data.add(sbom_task)
await self.__data.commit()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
