Skip to content

sbom: T8542: bugfix shadowing cmd() function with cmd variable name #1216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
c-po merged 1 commit into from
Jun 4, 2026
Merged

sbom: T8542: bugfix shadowing cmd() function with cmd variable name #1216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions scripts/image-build/build-vyos-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,16 +730,16 @@ Pin-Priority: 600
syft_target_dir = 'chroot'
syft_base_path = os.getcwd() + f'/{syft_target_dir}'
base_filename = iso_file.rstrip('.iso')
cmd = [['syft', syft_target_dir,
'--source-name', 'VyOS', '--source-version', version,
'-o', f'cyclonedx-json={base_filename}.cdx.json',
'-o', f'spdx-json={base_filename}.spdx.json']]
syft_cmd = [['syft', syft_target_dir,
'--source-name', 'VyOS', '--source-version', version,
'-o', f'cyclonedx-json={base_filename}.cdx.json',
'-o', f'spdx-json={base_filename}.spdx.json']]

# syft bug for CycloneDX https://github.com/anchore/syft/issues/4592#issuecomment-4567247328
cmd.append(['sed', '-i', '-e', f's@{syft_base_path}@@g', f'{base_filename}.cdx.json'])
cmd.append(['sed', '-i', '-e', f's@{syft_base_path}@//@g', f'{base_filename}.spdx.json'])
syft_cmd.append(['sed', '-i', '-e', f's@{syft_base_path}@@g', f'{base_filename}.cdx.json'])
syft_cmd.append(['sed', '-i', '-e', f's@{syft_base_path}@//@g', f'{base_filename}.spdx.json'])

for c in cmd:
for c in syft_cmd:
with subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
text=True, bufsize=1) as p:
for line in p.stdout:
Expand Down
Loading