gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-11 07:10:49 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix: format arg error (#4642)

Browse Source 
* fix: format arg error

* fix: xerrors.Errorf
This commit is contained in:
guangwu
2023-06-19 18:52:38 +08:00
committed by GitHub
parent 35c4262d0b
commit dcc73e964a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/sbom/spdx/marshal.go
View File

@@ -274,7 +274,7 @@ func (m *Marshaler) rootPackage(r types.Report, pkgDownloadLocation string) (*sp
pkgID, err := calcPkgID(m.hasher, fmt.Sprintf("%s-%s", r.ArtifactName, r.ArtifactType)) pkgID, err := calcPkgID(m.hasher, fmt.Sprintf("%s-%s", r.ArtifactName, r.ArtifactType))
if err != nil { if err != nil {
return nil, xerrors.Errorf("failed to get %s package ID: %w", err) return nil, xerrors.Errorf("failed to get %s package ID: %w", pkgID, err)
} }
pkgPurpose := PackagePurposeSource pkgPurpose := PackagePurposeSource
@@ -391,7 +391,7 @@ func (m *Marshaler) pkgFiles(pkg ftypes.Package) ([]*spdx.File, error) {
file, err := m.parseFile(pkg.FilePath, pkg.Digest) file, err := m.parseFile(pkg.FilePath, pkg.Digest)
if err != nil { if err != nil {
return nil, xerrors.Errorf("failed to parse file: %w") return nil, xerrors.Errorf("failed to parse file: %w", err)
} }
return []*spdx.File{ return []*spdx.File{
&file, &file,