Projects STRLCPY syft Commits 3a78371f
🤬
Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)
  • ■ ■ ■ ■ ■ ■
    syft/pkg/apk_metadata.go
    skipped 125 lines
    126 126   return m.OriginPackage
    127 127   }
    128 128   
    129  - for _, p := range prefixes {
    130  - if strings.HasPrefix(m.Package, p) {
    131  - return strings.TrimPrefix(m.Package, p)
    132  - }
    133  - }
    134  - 
    135 129   groups := internal.MatchNamedCaptureGroups(upstreamPattern, m.Package)
    136 130   
    137 131   upstream, ok := groups["upstream"]
    138  - if ok {
    139  - return upstream
     132 + if !ok {
     133 + upstream = m.Package
    140 134   }
    141 135   
    142  - return m.Package
     136 + for _, p := range prefixes {
     137 + if strings.HasPrefix(upstream, p) {
     138 + return strings.TrimPrefix(upstream, p)
     139 + }
     140 + }
     141 + 
     142 + return upstream
    143 143  }
    144 144   
  • ■ ■ ■ ■ ■ ■
    syft/pkg/apk_metadata_test.go
    skipped 302 lines
    303 303   },
    304 304   expected: "123456",
    305 305   },
     306 + {
     307 + name: "ruby-3.6 upstream ruby",
     308 + metadata: ApkMetadata{
     309 + Package: "ruby-3.6",
     310 + },
     311 + expected: "ruby",
     312 + },
     313 + {
     314 + name: "ruby3.6 upstream ruby",
     315 + metadata: ApkMetadata{
     316 + Package: "ruby3.6",
     317 + },
     318 + expected: "ruby",
     319 + },
    306 320   }
    307 321   
    308 322   for _, test := range tests {
    skipped 11 lines
Please wait...
Page is in error, reload to recover