12
12
13
13
from packageurl import PackageURL
14
14
from univers .version_range import ArchLinuxVersionRange
15
- from univers .versions import ArchLinuxVersion
16
15
17
16
from vulnerabilities .importer import AdvisoryData
18
- from vulnerabilities .importer import AffectedPackage
17
+ from vulnerabilities .importer import AffectedPackageV2
19
18
from vulnerabilities .importer import ReferenceV2
20
19
from vulnerabilities .pipelines import VulnerableCodeBaseImporterPipelineV2
21
20
from vulnerabilities .utils import fetch_response
@@ -64,15 +63,15 @@ def parse_advisory(self, record) -> AdvisoryData:
64
63
affected_version_range = (
65
64
ArchLinuxVersionRange .from_versions ([affected ]) if affected else None
66
65
)
67
- fixed_version = ArchLinuxVersion ( fixed ) if fixed else None
68
- affected_package = AffectedPackage (
66
+ fixed_version_range = ArchLinuxVersionRange . from_versions ([ fixed ] ) if fixed else None
67
+ affected_package = AffectedPackageV2 (
69
68
package = PackageURL (
70
69
name = name ,
71
70
type = "alpm" ,
72
71
namespace = "archlinux" ,
73
72
),
74
73
affected_version_range = affected_version_range ,
75
- fixed_version = fixed_version ,
74
+ fixed_version_range = fixed_version_range ,
76
75
)
77
76
affected_packages .append (affected_package )
78
77
@@ -91,7 +90,7 @@ def parse_advisory(self, record) -> AdvisoryData:
91
90
)
92
91
93
92
return AdvisoryData (
94
- advisory_id = f"alpm/ { avg_name } " ,
93
+ advisory_id = avg_name ,
95
94
aliases = aliases ,
96
95
summary = summary ,
97
96
references_v2 = references ,
0 commit comments