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
1diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
2index b3fa75c..68431ea 100755
3--- a/scripts/cve_lib.py
4+++ b/scripts/cve_lib.py
5@@ -115,11 +115,11 @@ subprojects = {
6 "eol": False,
7 "oval": True,
8 "packages": ["trusty-esm-supported.txt"],
9- "name": "Ubuntu 14.04 ESM",
10+ "name": "Ubuntu 14.04 LTS",
11 "codename": "Trusty Tahr",
12 "alias": "trusty/esm",
13 "ppas": [
14- {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
15+ {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
16 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}
17 ],
18 "parent": "ubuntu/trusty",
19@@ -131,10 +131,10 @@ subprojects = {
20 "oval": True,
21 "components": ["main", "restricted"],
22 "packages": ["esm-infra-xenial-supported.txt"],
23- "name": "Ubuntu 16.04 ESM",
24+ "name": "Ubuntu 16.04 LTS",
25 "codename": "Xenial Xerus",
26 "ppas": [
27- {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
28+ {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
29 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}
30 ],
31 "parent": "ubuntu/xenial",
32@@ -146,10 +146,10 @@ subprojects = {
33 "oval": True,
34 "components": ["main", "restricted"],
35 "packages": ["esm-infra-bionic-supported.txt"],
36- "name": "Ubuntu 18.04 ESM",
37+ "name": "Ubuntu 18.04 LTS",
38 "codename": "Bionic Beaver",
39 "ppas": [
40- {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
41+ {"ppa": "ubuntu-esm/esm-infra-security", "pocket": "security"},
42 {"ppa": "ubuntu-esm/esm-infra-updates", "pocket": "updates"}
43 ],
44 "parent": "ubuntu/bionic",
45@@ -161,10 +161,10 @@ subprojects = {
46 "oval": True,
47 "components": ["universe", "multiverse"],
48 "packages": ["esm-apps-xenial-supported.txt"],
49- "name": "Ubuntu 16.04 ESM",
50+ "name": "Ubuntu 16.04 LTS",
51 "codename": "Xenial Xerus",
52 "ppas": [
53- {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
54+ {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
55 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
56 ],
57 "parent": "esm-infra/xenial",
58@@ -176,10 +176,10 @@ subprojects = {
59 "oval": True,
60 "components": ["universe", "multiverse"],
61 "packages": ["esm-apps-bionic-supported.txt"],
62- "name": "Ubuntu 18.04 ESM",
63+ "name": "Ubuntu 18.04 LTS",
64 "codename": "Bionic Beaver",
65 "ppas": [
66- {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
67+ {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
68 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
69 ],
70 "parent": "esm-infra/bionic",
71@@ -191,10 +191,10 @@ subprojects = {
72 "oval": True,
73 "components": ["universe", "multiverse"],
74 "packages": ["esm-apps-focal-supported.txt"],
75- "name": "Ubuntu 20.04 ESM",
76+ "name": "Ubuntu 20.04 LTS",
77 "codename": "Focal Fossa",
78 "ppas": [
79- {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
80+ {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
81 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
82 ],
83 "parent": "ubuntu/focal",
84@@ -206,10 +206,10 @@ subprojects = {
85 "oval": True,
86 "components": ["universe", "multiverse"],
87 "packages": ["esm-apps-jammy-supported.txt"],
88- "name": "Ubuntu 22.04 ESM",
89+ "name": "Ubuntu 22.04 LTS",
90 "codename": "Jammy Jellyfish",
91 "ppas": [
92- {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
93+ {"ppa": "ubuntu-esm/esm-apps-security", "pocket": "security"},
94 {"ppa": "ubuntu-esm/esm-apps-updates", "pocket": "updates"}
95 ],
96 "parent": "ubuntu/jammy",
97@@ -776,7 +776,7 @@ def get_subproject_details_by_ppa_url_and_series(url, series):
98 prod, ser = product_series(rel)
99 if ser == series:
100 try:
101- for ppa_pocket in subprojects[rel]["ppas"]:
102+ for ppa_pocket in subprojects[rel]["ppas"]:
103 if ppa_pocket['ppa'] in url:
104 product = prod
105 canon = product + "/" + series
106@@ -877,7 +877,7 @@ def release_version(rel):
107 if details:
108 version = details["version"]
109 return version
110-
111+
112 def release_ppas(rel):
113 """Return the ppas for a given subproject."""
114 ppas = None
115@@ -913,7 +913,7 @@ def is_cve_triage_required(rel):
116 """Check if CVE triage is required for a given release"""
117 if rel not in external_releases:
118 return True
119-
120+
121 try:
122 _,_,_,details = get_subproject_details(rel)
123 return details['support_metadata']['cve_triage']

Subscribers

People subscribed via source and target branches