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

[Andreas Hasenack]

groovy has no ESM yet, but we want to SRU this fix all the way back to trusty and groovy is the first step.

I'm not updating lp:update-notifier because there is some disagreement whether it should be in bzr or git, and both are already out of date when compared to what is in groovy.

DEP8 tests pass:
(...)
Ran 18 tests in 3.221s

OK
autopkgtest [17:25:24]: test nose-tests: -----------------------]
autopkgtest [17:25:25]: test nose-tests: - - - - - - - - - - results - - - - - - - - - -
nose-tests PASS
autopkgtest [17:25:25]: @@@@@@@@@@@@@@@@@@@@ summary
nose-tests PASS

real 6m56,566s

[Bryce Harrington (bryce)]

LGTM.

Just a suggestion, but you may also want to mention in the changelog that UbuntuESMApps is being differentiated from UbuntuESM. Not sure how to phrase that in a non-confusing way, but that seems like a notable change. At first glance, I thought this was squashing two unrelated changes.

review: Approve

[Andreas Hasenack (ahasenack)]

Good point, I overlooked that

[Andreas Hasenack (ahasenack)]

Tagging and uploading edc979eddff19888872f0fd0aee865c58ffb9960

$ git push pkg upload/3.192.32
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 4 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.43 KiB | 121.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/update-notifier
 * [new tag] upload/3.192.32 -> upload/3.192.32

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

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 9850622..f681b72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+update-notifier (3.192.32) groovy; 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
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 12 Jun 2020 11:21:25 -0300
+
 update-notifier (3.192.31) groovy; urgency=medium
 
   * Update debian/tests/control to depend on pyflakes3 not pyflakes.