Merge ~chad.smith/ubuntu/+source/update-notifier:ua-motd-bionic into ubuntu/+source/update-notifier:ubuntu/bionic-proposed
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merge reported by: | Chad Smith | ||||||||||||
Merged at revision: | 5e8cdcf82b639c45b9faed6b52af7ecd188087c4 | ||||||||||||
Proposed branch: | ~chad.smith/ubuntu/+source/update-notifier:ua-motd-bionic | ||||||||||||
Merge into: | ubuntu/+source/update-notifier:ubuntu/bionic-proposed | ||||||||||||
Diff against target: |
414 lines (+296/-10) 4 files modified
data/apt_check.py (+116/-5) debian/changelog (+20/-0) tests/test_motd.py (+151/-0) tests/test_pep8.py (+9/-5) |
||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Murray (community) | Approve | ||
Review via email: mp+391843@code.launchpad.net |
Description of the change
Cherry picks of upstream commits to support motd information about ESM Apps and ESM Infra for ubuntu-
Not certain which branch should best be targeted for this merge and from whom to request review.
The following is a list of cherrypicks performed and merged:
cherry-
cherry-pick upstream/master 7a0458f62
cherry-
cherry-pick 4b2fb30fddf93f1
cherry-pick e39789ac632585b
cherry-pick ubuntu/devel commit c065e9ebd957ead
This constitutes the following debian/changelog entry:
[ Julian Andres Klode ]
* Handle missing cases of LP: #1822340, where we told people ESM is not
enabled, but not how to enable it.
* Fix multiple disabled ESM repositories being counted as enabled ones.
[ Brian Murray ]
* data/apt_check.py: modify wording and output regarding ESM support.
(LP: #1842508)
[ Andreas Hasenack ]
* data/apt_check.py: Update ESM security pockets names (LP: #1881632)
- the UbuntuESM pocket was renamed from <distro>-security to
<
- new origin UbuntuESMApps, with a corresponding pocket of
<
Uploaded https:/ /launchpad. net/ubuntu/ bionic/ +queue? queue_state= 1&queue_ text=update- notifier