oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup redundant code (#2791)

Browse Source 
Signed-off-by: guoguangwu <guoguangwug@gmail.com>
This commit is contained in:
guangwu 2024-04-20 00:12:48 +08:00 committed by GitHub
parent b26b38d6c5
commit fe4819bc08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
syft/pkg/license.go
View File

@ -146,9 +146,6 @@ func (s License) Merge(l License) (*License, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err != nil {
return nil, err
}
if sHash != lHash { if sHash != lHash {
return nil, fmt.Errorf("cannot merge licenses with different hash") return nil, fmt.Errorf("cannot merge licenses with different hash")
} }

3
syft/source/stereoscopesource/image_source_provider.go
View File

@ -40,9 +40,6 @@ func (l stereoscopeImageSourceProvider) Provide(ctx context.Context) (source.Sou
Exclude: l.cfg.Exclude, Exclude: l.cfg.Exclude,
Alias: l.cfg.Alias, Alias: l.cfg.Alias,
} }
if err != nil {
return nil, err
}
return New(img, cfg), nil return New(img, cfg), nil
} }