Skip to content

Commit 54faa68

Browse files
authored
sca: Adjust generate{Perl,Ruby}Deps to account for non-usrmerge (#2454)
Signed-off-by: Sergio Durigan Junior <sergiodj@chainguard.dev>
1 parent 055cf95 commit 54faa68

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

pkg/sca/sca.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,10 +839,17 @@ func generatePerlDeps(ctx context.Context, hdl SCAHandle, generated *config.Depe
839839
return err
840840
}
841841

842-
perlModuleMatch, err := fs.Glob(fsys, "usr/lib/perl[0-9]/*_perl")
842+
perlModuleMatchUsrLib, err := fs.Glob(fsys, "usr/lib/perl[0-9]*/*_perl")
843843
if err != nil {
844844
return err
845845
}
846+
perlModuleMatchLib, err := fs.Glob(fsys, "lib/perl[0-9]*/*_perl")
847+
if err != nil {
848+
return err
849+
}
850+
851+
perlModuleMatch := slices.Clone(perlModuleMatchUsrLib)
852+
perlModuleMatch = append(perlModuleMatch, perlModuleMatchLib...)
846853
if len(perlModuleMatch) == 0 {
847854
return nil
848855
}
@@ -940,10 +947,17 @@ func generateRubyDeps(ctx context.Context, hdl SCAHandle, generated *config.Depe
940947
return err
941948
}
942949

943-
rubyGemMatches, err := fs.Glob(fsys, "usr/lib/ruby/gems/[0-9]*.[0-9]*.[0.9]*/gems")
950+
rubyGemMatchesUsrLib, err := fs.Glob(fsys, "usr/lib/ruby/gems/[0-9]*.[0-9]*.[0.9]*/gems")
944951
if err != nil {
945952
return err
946953
}
954+
rubyGemMatchesLib, err := fs.Glob(fsys, "lib/ruby/gems/[0-9]*.[0-9]*.[0.9]*/gems")
955+
if err != nil {
956+
return err
957+
}
958+
959+
rubyGemMatches := slices.Clone(rubyGemMatchesUsrLib)
960+
rubyGemMatches = append(rubyGemMatches, rubyGemMatchesLib...)
947961
if len(rubyGemMatches) == 0 {
948962
return nil
949963
}

0 commit comments

Comments
 (0)