Launchpad itself

Merge ~lgp171188/launchpad:handle-alternative-esm-format-uctimport into launchpad:master

  1. Git
  2. lp:~lgp171188/launchpad
  3. handle-alternative-esm-format-uctimport
  4. Merge into master
Proposed by Guruprasad
Status: Merged
Approved by: Guruprasad
Approved revision: 6ee786bf6620bf8900ef21b1d208dec3be1d0825
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~lgp171188/launchpad:handle-alternative-esm-format-uctimport
Merge into: launchpad:master
Diff against target: 43 lines (+18/-2)
2 files modified
lib/lp/bugs/scripts/tests/test_uct.py (+11/-0)
lib/lp/bugs/scripts/uct/models.py (+7/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Andrey Fedoseev (community) Approve
Review via email: mp+431501@code.launchpad.net

Commit message

Handle another esm name format in the uct import script

To post a comment you must log in.
Revision history for this message
Andrey Fedoseev (andrey-fedoseev) :
review: Approve
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/bugs/scripts/tests/test_uct.py b/lib/lp/bugs/scripts/tests/test_uct.py
2index 00bc2c8..2f27ef0 100644
3--- a/lib/lp/bugs/scripts/tests/test_uct.py
4+++ b/lib/lp/bugs/scripts/tests/test_uct.py
5@@ -428,6 +428,17 @@ class TestCVE(TestCaseWithFactory):
6 self.assertListEqual(self.uct_record.packages, uct_record.packages)
7 self.assertDictEqual(self.uct_record.__dict__, uct_record.__dict__)
8
9+ def test_get_distro_series_esm_patterns(self):
10+ ubuntu_esm = self.factory.makeDistribution(name="ubuntu-esm")
11+ xenial = self.factory.makeDistroSeries(
12+ distribution=ubuntu_esm, name="xenial"
13+ )
14+ precise = self.factory.makeDistroSeries(
15+ distribution=ubuntu_esm, name="precise"
16+ )
17+ self.assertEqual(xenial, CVE.get_distro_series("esm-infra/xenial"))
18+ self.assertEqual(precise, CVE.get_distro_series("precise/esm"))
19+
20
21 class TestUCTImporterExporter(TestCaseWithFactory):
22
23diff --git a/lib/lp/bugs/scripts/uct/models.py b/lib/lp/bugs/scripts/uct/models.py
24index b7b7f6e..e5405b5 100644
25--- a/lib/lp/bugs/scripts/uct/models.py
26+++ b/lib/lp/bugs/scripts/uct/models.py
27@@ -805,9 +805,14 @@ class CVE:
28 cls, distro_series_name: str
29 ) -> Optional[DistroSeries]:
30 if "/" in distro_series_name:
31- series_name, distro_name = distro_series_name.split("/", 1)
32- if distro_name == "esm":
33+ if distro_series_name.startswith("esm-"):
34 distro_name = "ubuntu-esm"
35+ series_name = distro_series_name.split("/", 1)[1]
36+ elif distro_series_name.endswith("/esm"):
37+ distro_name = "ubuntu-esm"
38+ series_name = distro_series_name.split("/", 1)[0]
39+ else:
40+ series_name, distro_name = distro_series_name.split("/", 1)
41 else:
42 distro_name = "ubuntu"
43 series_name = distro_series_name

Subscribers

People subscribed via source and target branches

to status/vote changes: