Merge ~chad.smith/ubuntu/+source/update-notifier:ua-motd-focal into ubuntu/+source/update-notifier:ubuntu/focal-proposed

[Chad Smith]

Cherry picks of upstream commits to support ESM Apps and ESM Infra for ubuntu-advantage-tools motd package counts and availability.

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-pick ubuntu/devel commit c065e9ebd957ead33c7afc4d570b0ee0433f7601

This constitutes the following debian/changelog entry:

  [ Andreas Hasenack ]
  * data/apt_check.py: Update ESM security pockets names (LP: #1881632)
    - the UbuntuESM pocket was renamed from <distro>-security to
      <distro>-infra-security
    - new origin UbuntuESMApps, with a corresponding pocket of
      <distro>-apps-security

[Brian Murray (brian-murray)]

When this change landed in groovy it included an update to tests/apt_check.py. I'm not seeing that test modification in this PR. Am I missing something or could it be added?

review: Needs Fixing

[Brian Murray (brian-murray)]

Please fix the changelog version.

review: Needs Fixing

[Brian Murray (brian-murray)]

Uploaded https://launchpad.net/ubuntu/focal/+queue?queue_state=1&queue_text=update-notifier

review: Approve

diff --git a/data/apt_check.py b/data/apt_check.py
index 4051460..ed729c9 100755
--- a/data/apt_check.py
+++ b/data/apt_check.py
@@ -16,6 +16,8 @@ DISTRO = subprocess.check_output(
     ["lsb_release", "-c", "-s"],
     universal_newlines=True).strip()
 
+ESM_ORIGINS = ("UbuntuESM", "UbuntuESMApps")
+
 
 def _(msg):
     return gettext.dgettext("update-notifier", msg)
@@ -45,7 +47,8 @@ def saveDistUpgrade(cache, depcache):
 def isSecurityUpgrade(ver):
     " check if the given version is a security update (or masks one) "
     security_pockets = [("Ubuntu", "%s-security" % DISTRO),
-                        ("UbuntuESM", "%s-security" % DISTRO),
+                        ("UbuntuESM", "%s-infra-security" % DISTRO),
+                        ("UbuntuESMApps", "%s-apps-security" % DISTRO),
                         ("gNewSense", "%s-security" % DISTRO),
                         ("Debian", "%s-updates" % DISTRO)]
     for (file, index) in ver.file_list:
@@ -58,7 +61,7 @@ def isSecurityUpgrade(ver):
 def isESMUpgrade(ver):
     " check if the given version is a security update (or masks one) "
     for (file, index) in ver.file_list:
-        if file.origin == "UbuntuESM" and file.archive.startswith(DISTRO):
+        if file.origin in ESM_ORIGINS and file.archive.startswith(DISTRO):
             return True
     return False
 
@@ -152,7 +155,7 @@ def has_disabled_esm_security_update(depcache, pkg):
             break
 
         for (file, index) in ver.file_list:
-            if (file.origin == "UbuntuESM" and file.archive.startswith(DISTRO)
+            if (file.origin in ESM_ORIGINS and file.archive.startswith(DISTRO)
                     and depcache.policy.get_priority(file) == -32768):
                 return True
     return False
@@ -202,7 +205,7 @@ def run(options=None):
     # first place.
     have_esm = None        # None == does not exist
     for file in cache.file_list:
-        if file.origin == "UbuntuESM" and file.archive.startswith(DISTRO):
+        if file.origin in ESM_ORIGINS and file.archive.startswith(DISTRO):
             # In case of multiple ESM repos, one enabled is sufficient.
             if depcache.policy.get_priority(file) == -32768:
                 # We found a disabled ESM repository, but we'll only count
diff --git a/debian/changelog b/debian/changelog
index a432b22..18f4365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+update-notifier (3.192.30.1) focal; urgency=medium
+
+  [ Chad Smith ]
+  * data/apt_check.py: Update ESM security pockets names (LP: #1881632)
+    - the UbuntuESM pocket was renamed from <distro>-security to
+      <distro>-infra-security
+    - new origin UbuntuESMApps, with a corresponding pocket of
+      <distro>-apps-security
+
+ -- Chad Smith <[e-mail]>  Fri, 11 Sep 2020 15:40:03 -0600
+
 update-notifier (3.192.30) focal; urgency=medium
 
   * pixmaps/scalable/livepatch-ok,warning, src/livepatch-tray.c: