Merge ~ahasenack/ubuntu/+source/update-notifier:trusty-update-notifier-esm-aware into ubuntu/+source/update-notifier:ubuntu/trusty-devel

Proposed by Andreas Hasenack
Status: Approved
Approved by: Andreas Hasenack
Approved revision: 5bb0d847fa516e05c3a2cbe33a5cf4f3567a35a0
Proposed branch: ~ahasenack/ubuntu/+source/update-notifier:trusty-update-notifier-esm-aware
Merge into: ubuntu/+source/update-notifier:ubuntu/trusty-devel
Diff against target: 28 lines (+8/-1)
2 files modified
data/apt_check.py (+1/-1)
debian/changelog (+7/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Canonical Server packageset reviewers Pending
Review via email: mp+386205@code.staging.launchpad.net

Description of the change

The linked SRU bug has testing instructions and other information.

I'd just like to highlight here as well that the UbuntuESMApps change is just to future-proof the client (if such a thing as future-proofing exists in software ;). At the moment, ESM for Apps only exists for xenial iiuc. Therefore, I have no way of testing it for trusty. At most, I could apply the same change to a xenial package, and then test it, but ubuntu-notifier doesn't know much about ESM in its xenial encarnation, since the ESM srus have been focused on trusty only so far.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/update-notifier-esm-1881632

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

While testing the esm for apps bit with a hack, to fake lsb-release into thinking it's a xenial system, I found out that the current patck is mixing esm-infra and esm-apps security updates into just esm-infra:
"""
3 of these updates are provided through UA Infrastructure ESM.
"""
The statement above is mixing both repositories, but stating that it's only counting infra.

I'll suggest to just remove "Infrastructure" from that phrasing.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This change is much simpler now, and I updated the SRU bug with the details under "Regression Potential" and "Other Info" about why I changed the patch to what it is here. The test case remains the same.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

PPA for testing remains the same

Revision history for this message
Bryce Harrington (bryce) wrote :

This follows on the update-notifier MP from a couple weeks ago.

I followed the test case directions on the SRU bug to reproduce the problem + fix in lxc:

root@esm-trusty:~# sudo /usr/lib/update-notifier/apt-check --human-readable
UA Infrastructure Extended Security Maintenance (ESM) is enabled.

83 updates can be installed immediately.
83 of these updates are provided through UA Infrastructure ESM.
80 of these updates are security updates.
To see these additional updates run: apt list --upgradable

LGTM, +1

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, tagging and uploading 5bb0d847fa516e05c3a2cbe33a5cf4f3567a35a0

$ git push pkg upload/0.154.1ubuntu9
Enumerating objects: 14, done.
Counting objects: 100% (14/14), done.
Delta compression using up to 4 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.07 KiB | 91.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/update-notifier
 * [new tag] upload/0.154.1ubuntu9 -> upload/0.154.1ubuntu9

$ dput ubuntu ../update-notifier_0.154.1ubuntu9_source.changes
Checking signature on .changes
gpg: ../update-notifier_0.154.1ubuntu9_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../update-notifier_0.154.1ubuntu9.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading update-notifier_0.154.1ubuntu9.dsc: done.
  Uploading update-notifier_0.154.1ubuntu9.tar.xz: done.
  Uploading update-notifier_0.154.1ubuntu9_source.buildinfo: done.
  Uploading update-notifier_0.154.1ubuntu9_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This was deemed inappropriate for a trusty sru and will be handled by #security so it lands in the ESM pocket.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches