mirror of
https://github.com/aquasecurity/trivy.git
synced 2025-12-06 04:41:18 -08:00
fix: format arg error (#4642)
* fix: format arg error * fix: xerrors.Errorf
This commit is contained in:
@@ -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))
|
||||
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
|
||||
@@ -391,7 +391,7 @@ func (m *Marshaler) pkgFiles(pkg ftypes.Package) ([]*spdx.File, error) {
|
||||
|
||||
file, err := m.parseFile(pkg.FilePath, pkg.Digest)
|
||||
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{
|
||||
&file,
|
||||
|
||||
Reference in New Issue
Block a user