T9203: Enrich SBOM files with additional metadata

1 files changed, 8 insertions, 2 deletions

diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index a13e1611..5a51de25 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -759,7 +759,10 @@ Pin-Priority: 600
                 for line in p.stdout:
                     sys.stdout.write(line)
                     sys.stdout.flush()
-                p.wait()
+                if p.wait() != 0:
+                    raise ImageBuildError(
+                        f'SBOM command failed with exit status {p.returncode}: {" ".join(unsquashfs_cmd)}'
+                    )
 
             # VyOS declares ID=vyos with no ID_LIKE, therefore Syft can't detect the system correctly
             with open(os.path.join(syft_target_dir, 'etc/os-release'), 'a') as f:
@@ -794,7 +797,10 @@ Pin-Priority: 600
                     for line in p.stdout:
                         sys.stdout.write(line)
                         sys.stdout.flush()
-                    p.wait()
+                    if p.wait() != 0:
+                        raise ImageBuildError(
+                            f'SBOM command failed with exit status {p.returncode}: {" ".join(c)}'
+                        )
 
             # Add metadata.authors/supplier/lifecycles information to the SBOM file
             cdx_file = f'{base_filename}.cdx.json'