Ubuntu CVE Tracker

Merge ~ebarretto/ubuntu-cve-tracker:oval-bugs into ubuntu-cve-tracker:master

  1. Git
  2. lp:~ebarretto/ubuntu-cve-tracker
  3. oval-bugs
  4. Merge into master
Proposed by Eduardo Barretto
Status: Merged
Merged at revision: 97f0a973a143923ad223dfae61bf51d769a3fd47
Proposed branch: ~ebarretto/ubuntu-cve-tracker:oval-bugs
Merge into: ubuntu-cve-tracker:master
Diff against target: 123 lines (+17/-17)
1 file modified
scripts/cve_lib.py (+17/-17)
Reviewer Review Type Date Requested Status
David Fernandez Gonzalez Approve
Review via email: mp+460526@code.launchpad.net

Description of the change

Small fix to follow Amir's PR #460242, to fix name of ESM releases to our current direction.
Also fixed some trailing whitespaces.

To post a comment you must log in.
Revision history for this message
David Fernandez Gonzalez (litios) wrote :

Thanks :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
index b3fa75c..68431ea 100755
--- a/scripts/cve_lib.py
+++ b/scripts/cve_lib.py
@@ -115,11 +115,11 @@ subprojects = {
115 "eol": False,115 "eol": False,
116 "oval": True,116 "oval": True,
117 "packages": ["trusty-esm-supported.txt"],117 "packages": ["trusty-esm-supported.txt"],
118 "name": "Ubuntu 14.04 ESM",118 "name": "Ubuntu 14.04 LTS",
119 "codename": "Trusty Tahr",119 "codename": "Trusty Tahr",
120 "alias": "trusty/esm",120 "alias": "trusty/esm",
121 "ppas": [121 "ppas": [
122 {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"}, 122 {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
123 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}123 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}
124 ],124 ],
125 "parent": "ubuntu/trusty",125 "parent": "ubuntu/trusty",
@@ -131,10 +131,10 @@ subprojects = {
131 "oval": True,131 "oval": True,
132 "components": ["main", "restricted"],132 "components": ["main", "restricted"],
133 "packages": ["esm-infra-xenial-supported.txt"],133 "packages": ["esm-infra-xenial-supported.txt"],
134 "name": "Ubuntu 16.04 ESM",134 "name": "Ubuntu 16.04 LTS",
135 "codename": "Xenial Xerus",135 "codename": "Xenial Xerus",
136 "ppas": [136 "ppas": [
137 {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"}, 137 {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
138 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}138 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}
139 ],139 ],
140 "parent": "ubuntu/xenial",140 "parent": "ubuntu/xenial",
@@ -146,10 +146,10 @@ subprojects = {
146 "oval": True,146 "oval": True,
147 "components": ["main", "restricted"],147 "components": ["main", "restricted"],
148 "packages": ["esm-infra-bionic-supported.txt"],148 "packages": ["esm-infra-bionic-supported.txt"],
149 "name": "Ubuntu 18.04 ESM",149 "name": "Ubuntu 18.04 LTS",
150 "codename": "Bionic Beaver",150 "codename": "Bionic Beaver",
151 "ppas": [151 "ppas": [
152 {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"}, 152 {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
153 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}153 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}
154 ],154 ],
155 "parent": "ubuntu/bionic",155 "parent": "ubuntu/bionic",
@@ -161,10 +161,10 @@ subprojects = {
161 "oval": True,161 "oval": True,
162 "components": ["universe", "multiverse"],162 "components": ["universe", "multiverse"],
163 "packages": ["esm-apps-xenial-supported.txt"],163 "packages": ["esm-apps-xenial-supported.txt"],
164 "name": "Ubuntu 16.04 ESM",164 "name": "Ubuntu 16.04 LTS",
165 "codename": "Xenial Xerus",165 "codename": "Xenial Xerus",
166 "ppas": [166 "ppas": [
167 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"}, 167 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
168 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}168 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
169 ],169 ],
170 "parent": "esm-infra/xenial",170 "parent": "esm-infra/xenial",
@@ -176,10 +176,10 @@ subprojects = {
176 "oval": True,176 "oval": True,
177 "components": ["universe", "multiverse"],177 "components": ["universe", "multiverse"],
178 "packages": ["esm-apps-bionic-supported.txt"],178 "packages": ["esm-apps-bionic-supported.txt"],
179 "name": "Ubuntu 18.04 ESM",179 "name": "Ubuntu 18.04 LTS",
180 "codename": "Bionic Beaver",180 "codename": "Bionic Beaver",
181 "ppas": [181 "ppas": [
182 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"}, 182 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
183 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}183 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
184 ],184 ],
185 "parent": "esm-infra/bionic",185 "parent": "esm-infra/bionic",
@@ -191,10 +191,10 @@ subprojects = {
191 "oval": True,191 "oval": True,
192 "components": ["universe", "multiverse"],192 "components": ["universe", "multiverse"],
193 "packages": ["esm-apps-focal-supported.txt"],193 "packages": ["esm-apps-focal-supported.txt"],
194 "name": "Ubuntu 20.04 ESM",194 "name": "Ubuntu 20.04 LTS",
195 "codename": "Focal Fossa",195 "codename": "Focal Fossa",
196 "ppas": [196 "ppas": [
197 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"}, 197 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
198 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}198 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
199 ],199 ],
200 "parent": "ubuntu/focal",200 "parent": "ubuntu/focal",
@@ -206,10 +206,10 @@ subprojects = {
206 "oval": True,206 "oval": True,
207 "components": ["universe", "multiverse"],207 "components": ["universe", "multiverse"],
208 "packages": ["esm-apps-jammy-supported.txt"],208 "packages": ["esm-apps-jammy-supported.txt"],
209 "name": "Ubuntu 22.04 ESM",209 "name": "Ubuntu 22.04 LTS",
210 "codename": "Jammy Jellyfish",210 "codename": "Jammy Jellyfish",
211 "ppas": [211 "ppas": [
212 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"}, 212 {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
213 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}213 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
214 ],214 ],
215 "parent": "ubuntu/jammy",215 "parent": "ubuntu/jammy",
@@ -776,7 +776,7 @@ def get_subproject_details_by_ppa_url_and_series(url, series):
776 prod, ser = product_series(rel)776 prod, ser = product_series(rel)
777 if ser == series:777 if ser == series:
778 try:778 try:
779 for ppa_pocket in subprojects[rel]["ppas"]: 779 for ppa_pocket in subprojects[rel]["ppas"]:
780 if ppa_pocket['ppa'] in url:780 if ppa_pocket['ppa'] in url:
781 product = prod781 product = prod
782 canon = product + "/" + series782 canon = product + "/" + series
@@ -877,7 +877,7 @@ def release_version(rel):
877 if details:877 if details:
878 version = details["version"]878 version = details["version"]
879 return version879 return version
880 880
881def release_ppas(rel):881def release_ppas(rel):
882 """Return the ppas for a given subproject."""882 """Return the ppas for a given subproject."""
883 ppas = None883 ppas = None
@@ -913,7 +913,7 @@ def is_cve_triage_required(rel):
913 """Check if CVE triage is required for a given release"""913 """Check if CVE triage is required for a given release"""
914 if rel not in external_releases:914 if rel not in external_releases:
915 return True915 return True
916 916
917 try:917 try:
918 _,_,_,details = get_subproject_details(rel)918 _,_,_,details = get_subproject_details(rel)
919 return details['support_metadata']['cve_triage']919 return details['support_metadata']['cve_triage']

Subscribers

People subscribed via source and target branches