oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-05 00:46:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

bump JSON schema to account for simplified python env markers (#1967)

Browse Source 
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman
2023-07-27 14:13:17 +00:00
committed by GitHub
parent 9480f10ccd
commit d84120f499
5 changed files with 1937 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
syft/pkg/cataloger/python/parse_requirements.go
+3 -16
View File
@@ -156,25 +156,12 @@ func parseExtras(packageName string) []string {
return []string{}
}
func parseMarkers(line string) map[string]string {
markers := map[string]string{}
func parseMarkers(line string) string {
var markers string
parts := strings.SplitN(line, ";", 2)
if len(parts) == 2 {
splittableMarkers := parts[1]
for _, combineString := range []string{" or ", " and "} {
splittableMarkers = strings.TrimSpace(
strings.ReplaceAll(splittableMarkers, combineString, ","),
)
}
splittableMarkers = strings.TrimSpace(splittableMarkers)
for _, mark := range strings.Split(splittableMarkers, ",") {
markparts := strings.Split(mark, " ")
markers[markparts[0]] = strings.Join(markparts[1:], " ")
}
markers = strings.TrimSpace(parts[1])
}
return markers