Merge ~lamoura/update-notifier:fix-release into update-notifier:master

Proposed by Lucas Albuquerque Medeiros de Moura
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 037b1d98ea851f2aacdc00fd03e2c0551ee8b8fb
Merged at revision: 037b1d98ea851f2aacdc00fd03e2c0551ee8b8fb
Proposed branch: ~lamoura/update-notifier:fix-release
Merge into: update-notifier:master
Diff against target: 71 lines (+7/-7)
2 files modified
data/apt_check.py (+1/-1)
tests/test_motd.py (+6/-6)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Review via email: mp+430596@code.launchpad.net

Description of the change

Fix ua status call to pro status

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This will change all translation strings, but a quick grep shows that at least in the package the "sudo ua status" strings were not translated to begin with.

We can't upload this to kinetic right now because the beta release is tomorrow, but hopefully after that we can.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/apt_check.py b/data/apt_check.py
2index 6e0ffd1..d4ba000 100755
3--- a/data/apt_check.py
4+++ b/data/apt_check.py
5@@ -201,7 +201,7 @@ def _output_esm_package_alert(
6 outstream.write(
7 gettext.dgettext("update-notifier",
8 "See https://ubuntu.com/esm "
9- "or run: sudo ua status")
10+ "or run: sudo pro status")
11 )
12
13
14diff --git a/tests/test_motd.py b/tests/test_motd.py
15index 934e136..5eac62b 100755
16--- a/tests/test_motd.py
17+++ b/tests/test_motd.py
18@@ -86,7 +86,7 @@ class TestMotd(unittest.TestCase):
19 To see these additional updates run: apt list --upgradable
20
21 Enable ESM Infra to receive additional future security updates.
22- See https://ubuntu.com/esm or run: sudo ua status
23+ See https://ubuntu.com/esm or run: sudo pro status
24 """))
25
26 @mock.patch("apt_check.is_lts_distro", return_value=True)
27@@ -108,7 +108,7 @@ class TestMotd(unittest.TestCase):
28 To see these additional updates run: apt list --upgradable
29
30 Enable ESM Infra to receive additional future security updates.
31- See https://ubuntu.com/esm or run: sudo ua status
32+ See https://ubuntu.com/esm or run: sudo pro status
33 """))
34
35 @mock.patch("apt_check.is_lts_distro", return_value=True)
36@@ -129,7 +129,7 @@ class TestMotd(unittest.TestCase):
37 0 updates can be applied immediately.
38
39 Enable ESM Infra to receive additional future security updates.
40- See https://ubuntu.com/esm or run: sudo ua status
41+ See https://ubuntu.com/esm or run: sudo pro status
42 """))
43
44 @mock.patch("apt_check.is_lts_distro", return_value=True)
45@@ -233,7 +233,7 @@ class TestMotd(unittest.TestCase):
46 To see these additional updates run: apt list --upgradable
47
48 Enable ESM Infra to receive additional future security updates.
49- See https://ubuntu.com/esm or run: sudo ua status
50+ See https://ubuntu.com/esm or run: sudo pro status
51 """).lstrip())
52
53 @mock.patch("apt_check.get_distro_version", return_value="16.04")
54@@ -303,7 +303,7 @@ class TestMotd(unittest.TestCase):
55 To see these additional updates run: apt list --upgradable
56
57 Enable ESM Infra to receive additional future security updates.
58- See https://ubuntu.com/esm or run: sudo ua status
59+ See https://ubuntu.com/esm or run: sudo pro status
60 """))
61
62 @mock.patch("apt_check.is_lts_distro", return_value=True)
63@@ -491,7 +491,7 @@ class TestMotd(unittest.TestCase):
64 0 updates can be applied immediately.
65
66 Enable ESM Apps to receive additional future security updates.
67- See https://ubuntu.com/esm or run: sudo ua status
68+ See https://ubuntu.com/esm or run: sudo pro status
69 """))
70
71 @mock.patch("apt_check.is_lts_distro", return_value=True)

Subscribers

People subscribed via source and target branches