Merge ~renanrodrigo/ubuntu/+source/update-notifier:esm-cache-update-xenial into ubuntu/+source/update-notifier:ubuntu/xenial-devel

[Renan Rodrigo]

Rely on the Pro Client apt esm cache to check for esm updates

The Pro Client is not pinnning esm repositores and adding them to the system apt anymore, but using a separate cache instead.

[Christian Ehrhardt  (paelzer)]

I checked how other recent xenial uploads landed (as it is in ESM mode), but it seems they were handled just "normal" which is fine. I'm following the same path.

Since there are no git branches for xenial in the recent team owned git I've followed Renan's proposed git-ubuntu approach.

This made me do another few checks to see if that change of internal structure affects it.
I was wondering about the symlink that we've seen in later versions, but that doesn't exist at all in the xenial version - so the change of repositories can't break it either \o/.

It is now uploaded it including proper VCS info in .changes - should switch to merged once accepted.

Needed some extra steps to convince dput-ng to let it through.

[Christian Ehrhardt  (paelzer)]

This is uploaded and was combined with https://code.launchpad.net/~lamoura/ubuntu/+source/update-notifier/+git/update-notifier/+merge/436159

Consider it merged (even though it needs to land in -proposed for git-ubuntu to mark it that way).

diff --git a/data/apt_check.py b/data/apt_check.py
index 9915d1d..304ac66 100755
--- a/data/apt_check.py
+++ b/data/apt_check.py
@@ -307,51 +307,42 @@ def write_human_readable_summary(outstream, upgrades, security_updates,
     outstream.write("\n")
 
 
-def has_disabled_esm_security_update(depcache, pkg, esm_origin):
+def has_disabled_esm_security_update(esm_cache, pkg, esm_origin):
     " check if we have a disabled ESM security update "
     inst_ver = pkg.current_ver
     if not inst_ver:
         return False
 
-    for ver in pkg.version_list:
-        if ver == inst_ver:
-            break
+    if pkg.name not in esm_cache:
+        return False
 
-        for (file, index) in ver.file_list:
-            if (file.origin == esm_origin and file.archive.startswith(DISTRO)
-                    and depcache.policy.get_priority(file) == -32768):
+    esm_update = esm_cache[pkg.name]
+    for version in esm_update.version_list:
+        for (file, index) in version.file_list:
+            if file.origin == esm_origin:
                 return True
+
     return False
 
 
-def has_disabled_esm_apps_security_update(depcache, pkg):
+def has_disabled_esm_apps_security_update(esm_cache, pkg):
     " check if we have a disabled ESM Apps security update "
-    return has_disabled_esm_security_update(depcache, pkg, ESM_APPS_ORIGIN)
+    return has_disabled_esm_security_update(esm_cache, pkg, ESM_APPS_ORIGIN)
 
 
-def has_disabled_esm_infra_security_update(depcache, pkg):
+def has_disabled_esm_infra_security_update(esm_cache, pkg):
     " check if we have a disabled ESM Infra security update "
-    return has_disabled_esm_security_update(depcache, pkg, ESM_INFRA_ORIGIN)
+    return has_disabled_esm_security_update(esm_cache, pkg, ESM_INFRA_ORIGIN)
 
 
-def has_esm_service(cache, depcache, esm_origin):
+def has_esm_service(cache, esm_origin):
     " check if we have an enabled ESM service in the machine "
-    have_esm = None
     for file in cache.file_list:
         origin = file.origin
         if origin == esm_origin 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
-                # ESM as disabled here if we have not found any other ESM
-                # repo, so one ESM repo being enabled means ESM is enabled.
-                if have_esm is None:
-                    have_esm = False
-            else:
-                have_esm = True
-                break
+            return True
 
-    return have_esm
+    return False
 
 
 def init():
@@ -394,12 +385,17 @@ def run(options=None):
         sys.stderr.write("E: " + _("Error: Marking the upgrade (%s)") % e)
         sys.exit(-1)
 
+    try:
+        apt_pkg.config.set("Dir", "/var/lib/ubuntu-advantage/apt-esm/")
+        apt_pkg.init_system()
+        esm_cache = apt_pkg.Cache(progress=None)
+    except apt_pkg.Error:
+        esm_cache = None
+
     # Check if we have ESM enabled or disabled; and if it exists in the
     # first place.
-    have_esm_infra = has_esm_service(
-        cache, depcache, esm_origin=ESM_INFRA_ORIGIN)
-    have_esm_apps = has_esm_service(
-        cache, depcache, esm_origin=ESM_APPS_ORIGIN)
+    have_esm_infra = has_esm_service(cache, esm_origin=ESM_INFRA_ORIGIN)
+    have_esm_apps = has_esm_service(cache, esm_origin=ESM_APPS_ORIGIN)
 
     # analyze the ugprade
     upgrades = 0
@@ -412,10 +408,11 @@ def run(options=None):
     # we need another cache that has more pkg details
     with apt.Cache() as aptcache:
         for pkg in cache.packages:
-            if has_disabled_esm_apps_security_update(depcache, pkg):
-                disabled_esm_apps_updates += 1
-            if has_disabled_esm_infra_security_update(depcache, pkg):
-                disabled_esm_infra_updates += 1
+            if esm_cache:
+                if has_disabled_esm_apps_security_update(esm_cache, pkg):
+                    disabled_esm_apps_updates += 1
+                if has_disabled_esm_infra_security_update(esm_cache, pkg):
+                    disabled_esm_infra_updates += 1
 
             # skip packages that are not marked upgraded/installed
             if not (depcache.marked_install(pkg)