diff --git a/syft/cataloger/deb/cataloger.go b/syft/cataloger/deb/cataloger.go index a8d9422c4..49694fb38 100644 --- a/syft/cataloger/deb/cataloger.go +++ b/syft/cataloger/deb/cataloger.go @@ -38,6 +38,7 @@ func (c *Cataloger) Catalog(resolver source.Resolver) ([]pkg.Package, error) { return nil, fmt.Errorf("failed to find dpkg status files's by glob: %w", err) } + var results []pkg.Package var pkgs []pkg.Package for _, dbLocation := range dbFileMatches { dbContents, err := resolver.FileContentsByLocation(dbLocation) @@ -94,8 +95,10 @@ func (c *Cataloger) Catalog(resolver source.Resolver) ([]pkg.Package, error) { } } } + + results = append(results, pkgs...) } - return pkgs, nil + return results, nil } func fetchMd5Contents(resolver source.Resolver, dbLocation source.Location, pkgs []pkg.Package) (map[string]io.Reader, map[string]source.Location, error) { diff --git a/syft/pkg/dpkg_metadata.go b/syft/pkg/dpkg_metadata.go index 3f91c4879..b50ac49aa 100644 --- a/syft/pkg/dpkg_metadata.go +++ b/syft/pkg/dpkg_metadata.go @@ -8,7 +8,7 @@ import ( "github.com/scylladb/go-set/strset" ) -const DpkgDbGlob = "**/var/lib/dpkg/status" +const DpkgDbGlob = "**/var/lib/dpkg/{status,status.d/**}" var _ fileOwner = (*DpkgMetadata)(nil)