Merge ~renanrodrigo/ubuntu/+source/update-notifier:respect-phasing-xenial into ubuntu/+source/update-notifier:ubuntu/xenial-devel

[Renan Rodrigo]

isolate creation of the esm apt cache in apt-check

create a separate function to configure apt_pkg, create the esm cache
and reinitialize the default configuration

[Athos Ribeiro (athos-ribeiro)]

The code review was performed for the development branch at https://code.launchpad.net/~renanrodrigo/update-notifier/+git/update-notifier/+merge/438009.

The range diff is sane compared to the development changes. The only diff is the version/target series in the changelog.

The package builds fine and the DEP8 test suite is passing.

LGTM

I did split the logical changes from the changelog ones here though.

Thanks!

Uploaded:

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading update-notifier_3.168.20.dsc: done.
  Uploading update-notifier_3.168.20.tar.xz: done.
  Uploading update-notifier_3.168.20_source.buildinfo: done.
  Uploading update-notifier_3.168.20_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/data/apt_check.py b/data/apt_check.py
index 304ac66..164b2f9 100755
--- a/data/apt_check.py
+++ b/data/apt_check.py
@@ -16,6 +16,7 @@ import subprocess
 
 SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences"
 OS_RELEASE_PATH = "/etc/os-release"
+PRO_ESM_CACHE_DIR = "/var/lib/ubuntu-advantage/apt-esm/"
 
 
 def _get_info_from_os_release(key):
@@ -345,6 +346,30 @@ def has_esm_service(cache, esm_origin):
     return False
 
 
+def get_apt_pkg_esm_cache():
+    """Get an apt_pkg cache with the ubuntu-advantage-tools esm data.
+
+    Set the configuration to get the u-a-t cache, then set it back to an
+    empty configuration state and init again so other calls to Cache work as
+    expected.
+    """
+    for key in apt_pkg.config.keys():
+        if re.match(r"^Acquire", key) is None:
+            apt_pkg.config.clear(key)
+    apt_pkg.config.set("Dir", PRO_ESM_CACHE_DIR)
+    apt_pkg.init()
+    try:
+        esm_cache = apt_pkg.Cache(progress=None)
+    except apt_pkg.Error:
+        esm_cache = None
+
+    for key in apt_pkg.config.keys():
+        apt_pkg.config.clear(key)
+    apt_pkg.init()
+
+    return esm_cache
+
+
 def init():
     " init the system, be nice "
     # FIXME: do a ionice here too?
@@ -385,12 +410,7 @@ 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
+    esm_cache = get_apt_pkg_esm_cache()
 
     # Check if we have ESM enabled or disabled; and if it exists in the
     # first place.
diff --git a/debian/changelog b/debian/changelog
index 16fd87f..4db475b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+update-notifier (3.168.20) xenial; urgency=medium
+
+  * Isolate creation of the esm apt cache in apt-check (LP: #2008212)
+
+ -- Renan Rodrigo Barbosa <[e-mail]>  Mon, 27 Feb 2023 23:15:02 -0300
+
 update-notifier (3.168.19) xenial; urgency=medium
 
   [ Renan Rodrigo Barbosa]