From fe4819bc08e8405bfd67c0aa564c52c9dc8cc950 Mon Sep 17 00:00:00 2001 From: guangwu Date: Sat, 20 Apr 2024 00:12:48 +0800 Subject: [PATCH] chore: cleanup redundant code (#2791) Signed-off-by: guoguangwu --- syft/pkg/license.go | 3 --- syft/source/stereoscopesource/image_source_provider.go | 3 --- 2 files changed, 6 deletions(-) diff --git a/syft/pkg/license.go b/syft/pkg/license.go index 06c35a69a..fb79028ce 100644 --- a/syft/pkg/license.go +++ b/syft/pkg/license.go @@ -146,9 +146,6 @@ func (s License) Merge(l License) (*License, error) { if err != nil { return nil, err } - if err != nil { - return nil, err - } if sHash != lHash { return nil, fmt.Errorf("cannot merge licenses with different hash") } diff --git a/syft/source/stereoscopesource/image_source_provider.go b/syft/source/stereoscopesource/image_source_provider.go index a579413ac..1b1f78e4e 100644 --- a/syft/source/stereoscopesource/image_source_provider.go +++ b/syft/source/stereoscopesource/image_source_provider.go @@ -40,9 +40,6 @@ func (l stereoscopeImageSourceProvider) Provide(ctx context.Context) (source.Sou Exclude: l.cfg.Exclude, Alias: l.cfg.Alias, } - if err != nil { - return nil, err - } return New(img, cfg), nil }