From 1d6d5f7f5f3301c5ad9bcad8c3abcae59910e989 Mon Sep 17 00:00:00 2001 From: "Nicholas R. Smith" Date: Thu, 3 Aug 2023 12:33:11 -0700 Subject: [PATCH] fix: opkg search glob (#1994) Signed-off-by: Nicholas R. Smith --- syft/pkg/cataloger/deb/cataloger.go | 2 +- syft/pkg/cataloger/deb/cataloger_test.go | 2 +- .../glob-paths/usr/lib/opkg/info/{pkg-1.0 => pkg-1.0.control} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename syft/pkg/cataloger/deb/test-fixtures/glob-paths/usr/lib/opkg/info/{pkg-1.0 => pkg-1.0.control} (100%) diff --git a/syft/pkg/cataloger/deb/cataloger.go b/syft/pkg/cataloger/deb/cataloger.go index 377ebd75e..946abae9e 100644 --- a/syft/pkg/cataloger/deb/cataloger.go +++ b/syft/pkg/cataloger/deb/cataloger.go @@ -14,5 +14,5 @@ func NewDpkgdbCataloger() *generic.Cataloger { return generic.NewCataloger(catalogerName). // note: these globs have been intentionally split up in order to improve search performance, // please do NOT combine into: "**/var/lib/dpkg/{status,status.d/*}" - WithParserByGlobs(parseDpkgDB, "**/var/lib/dpkg/status", "**/var/lib/dpkg/status.d/*", "**/lib/opkg/info/*", "**/lib/opkg/status") + WithParserByGlobs(parseDpkgDB, "**/var/lib/dpkg/status", "**/var/lib/dpkg/status.d/*", "**/lib/opkg/info/*.control", "**/lib/opkg/status") } diff --git a/syft/pkg/cataloger/deb/cataloger_test.go b/syft/pkg/cataloger/deb/cataloger_test.go index 2297247c7..6e035be87 100644 --- a/syft/pkg/cataloger/deb/cataloger_test.go +++ b/syft/pkg/cataloger/deb/cataloger_test.go @@ -169,7 +169,7 @@ func TestCataloger_Globs(t *testing.T) { "var/lib/dpkg/status", "var/lib/dpkg/status.d/pkg-1.0", "usr/lib/opkg/status", - "usr/lib/opkg/info/pkg-1.0", + "usr/lib/opkg/info/pkg-1.0.control", }, }, } diff --git a/syft/pkg/cataloger/deb/test-fixtures/glob-paths/usr/lib/opkg/info/pkg-1.0 b/syft/pkg/cataloger/deb/test-fixtures/glob-paths/usr/lib/opkg/info/pkg-1.0.control similarity index 100% rename from syft/pkg/cataloger/deb/test-fixtures/glob-paths/usr/lib/opkg/info/pkg-1.0 rename to syft/pkg/cataloger/deb/test-fixtures/glob-paths/usr/lib/opkg/info/pkg-1.0.control