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

[Chad Smith]

Remaining barriers to upgrade support for Ubuntu Advantage. I've filed/ammended the current bugs for this feature/bugfix:

 [1] Add UA PPAs to mirrors.cfg: https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1893717

 [2] Drop apt cache lock inside runPostInstallScripts: https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1897778

Commit details:
 - 3c23ab91. add ubuntu-advantage PPA to valid commercial mirror URLs

 - 6b6f79583. release apt cache lock during PostUpgradeScripts runs (allows ua tools to upgrade apt sources due to release contract differences)

[Brian Murray (brian-murray)]

One in-line comment.

[Brian Murray (brian-murray)]

FYI - the debian/changelog referenced the same bug number twice. I'll sort it out though.

diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
index 9f4e76b..745e419 100644
--- a/DistUpgrade/DistUpgradeController.py
+++ b/DistUpgrade/DistUpgradeController.py
@@ -1518,8 +1518,13 @@ class DistUpgradeController(object):
         """ 
         scripts that are run in any case after the distupgrade finished 
         whether or not it was successful
+
+        Cache lock is released during script runs in the event that the
+        PostInstallScripts require apt or dpkg changes.
         """
         # now run the post-upgrade fixup scripts (if any)
+        if self.cache:
+            self.cache.release_lock()
         for script in self.config.getlist("Distro","PostInstallScripts"):
             if not os.path.exists(script):
                 logging.warning("PostInstallScript: '%s' not found" % script)
@@ -1531,6 +1536,8 @@ class DistUpgradeController(object):
                 self._view.getTerminal().call([script], hidden=True)
             except Exception as e:
                 logging.error("got error from PostInstallScript %s (%s)" % (script, e))
+        if self.cache:
+            self.cache.get_lock()
 
     def abort(self):
         """ abort the upgrade, cleanup (as much as possible) """
diff --git a/data/mirrors.cfg b/data/mirrors.cfg
index 6ba42de..af04ae1 100644
--- a/data/mirrors.cfg
+++ b/data/mirrors.cfg
@@ -17,6 +17,8 @@ ftp://ddebs.ubuntu.com/
 #commercial (both urls are valid)
 http://archive.canonical.com
 http://archive.canonical.com/ubuntu/
+
+https://private-ppa.launchpad.net/ubuntu-advantage/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 834fa7d..671d3e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ubuntu-release-upgrader (1:20.10.12) groovy; urgency=medium
+
+  [ Chad Smith ]
+  * data/mirrors.cfg: add ubuntu advantage pro PPA url as valid mirror
+    (LP: #1893717)
+  * DistUpgrade/DistUpgradeController.py: release cache lock during
+    runPostInstallScripts (LP: #1893717)
+
+ -- Chad Smith <[e-mail]>  Tue, 22 Sep 2020 16:59:52 -0600
+
 ubuntu-release-upgrader (1:20.10.11) groovy; urgency=medium
 
   [ Brian Murray ]
diff --git a/utils/update_mirrors.py b/utils/update_mirrors.py
index f604ad6..05ceadb 100755
--- a/utils/update_mirrors.py
+++ b/utils/update_mirrors.py
@@ -15,8 +15,8 @@ d = feedparser.parse("https://launchpad.net/ubuntu/+archivemirrors-rss")
 #pp  = pprint.PrettyPrinter(indent=4)
 #pp.pprint(d)
 
-# the first 29 lines are permanent
-permanent_lines = 29
+# the first 31 lines are permanent
+permanent_lines = 31
 lp_mirrors = set()
 new_mirrors = set()