From faf21a67a68cabfd4f15eb667b03fba6648cc5ab Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 29 Jun 2020 11:38:29 -0400 Subject: [PATCH] lib: return a protocol-based scope (dir or img) Signed-off-by: Alfredo Deza --- imgbom/lib.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/imgbom/lib.go b/imgbom/lib.go index d0368a2f5..c0e6a4b20 100644 --- a/imgbom/lib.go +++ b/imgbom/lib.go @@ -16,12 +16,19 @@ func IdentifyDistro(img *image.Image) *distro.Distro { return distro.Identify(img) } -func CatalogImage(img *image.Image, o scope.Option) (*pkg.Catalog, error) { - s, err := scope.NewScope(img, o) +func CatalogDir(d string, o scope.Option) (*pkg.Catalog, error) { + s, err := scope.NewDirScope(d, o) if err != nil { return nil, err } + return cataloger.Catalog(s) +} +func CatalogImg(img *image.Image, o scope.Option) (*pkg.Catalog, error) { + s, err := scope.NewImageScope(img, o) + if err != nil { + return nil, err + } return cataloger.Catalog(s) }