Merge ~chad.smith/ubuntu-release-upgrader:esm-support-pro-upgrades into ubuntu-release-upgrader:ubuntu/master

[Chad Smith]

Followup fixes for ubuntu advantage upgrade support

1. Instead of a private stable PPA for ubuntu-advantage we needed to create a public PPA that didn't require authentication. update the PPA URL in mirrors.cfg to http://ppa.launchpad.net/ua-client/stable/ubuntu

2. DistUpgradeController.py also needs to release the lock /var/lib/apt/lists/lock in runPostInstallScripts using self.cache.unlock_lists_dir()

3. fix d/changelog bug reference for cache lock release

[Brian Murray (brian-murray)]

One in-line comment.

[Chad Smith (chad.smith)]

> One in-line comment.

@brian-murray:

Confirmed that all public PPAs are only http (and don't support https). So this will remain http unless the following bug gets addressed for public PPAs.

https://bugs.launchpad.net/launchpad/+bug/1473091

[Brian Murray (brian-murray)]

review: Approve

diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
index 36e8520..18e1ac3 100644
--- a/DistUpgrade/DistUpgradeController.py
+++ b/DistUpgrade/DistUpgradeController.py
@@ -1524,6 +1524,7 @@ class DistUpgradeController(object):
         """
         if self.cache:
             self.cache.release_lock()
+            self.cache.unlock_lists_dir()
         # now run the post-upgrade fixup scripts (if any)
         for script in self.config.getlist("Distro","PostInstallScripts"):
             if not os.path.exists(script):
diff --git a/data/mirrors.cfg b/data/mirrors.cfg
index 54397dd..2d25217 100644
--- a/data/mirrors.cfg
+++ b/data/mirrors.cfg
@@ -18,7 +18,7 @@ ftp://ddebs.ubuntu.com/
 http://archive.canonical.com
 http://archive.canonical.com/ubuntu/
 
-https://private-ppa.launchpad.net/ubuntu-advantage/stable/ubuntu
+http://ppa.launchpad.net/ua-client/stable/ubuntu
 https://esm.ubuntu.com/ubuntu/
 https://esm.ubuntu.com/apps/ubuntu/
 https://esm.ubuntu.com/cc/ubuntu/
diff --git a/debian/changelog b/debian/changelog
index 671d3e8..d3dbae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ ubuntu-release-upgrader (1:20.10.12) groovy; urgency=medium
   * data/mirrors.cfg: add ubuntu advantage pro PPA url as valid mirror
     (LP: #1893717)
   * DistUpgrade/DistUpgradeController.py: release cache lock during
-    runPostInstallScripts (LP: #1893717)
+    runPostInstallScripts (LP: #1897778)
 
  -- Chad Smith <[e-mail]>  Tue, 22 Sep 2020 16:59:52 -0600