Merge ~chad.smith/ubuntu/+source/ubuntu-release-upgrader:uru-bionic-ubuntu-advantage into ubuntu/+source/ubuntu-release-upgrader:ubuntu/bionic-proposed

[Chad Smith]

WIP BRANCH until TBD Focal PR can be proposed

SRU of ESM upgrade support locks and official public PPA mirror

4 cherry picks:

git cherry-pick 3c23ab918585a9a0e72e60564ba734789f939813 # ubuntu/master
git cherry-pick 1fc540b9f5432539133db61a16af4b495be63a89 # ubuntu/master
git cherry-pick 6b6f79583687e56305a21f88d895925231e553b9 # ubuntu/master
git cherry-pick af4edfce71f3a98946fb06f823968e4aa4e5a4d7 # ubuntu/master

Add changlog entry:
  [ 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: #1897778)

[Brian Murray (brian-murray)]

I've uploaded these changes to the -proposed queue for review by the SRU team.

review: Approve

diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
index 97eeba4..7e2bb97 100644
--- a/DistUpgrade/DistUpgradeController.py
+++ b/DistUpgrade/DistUpgradeController.py
@@ -1504,7 +1504,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.
         """
+        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):
@@ -1517,6 +1523,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 e785a18..afb1b2b 100644
--- a/data/mirrors.cfg
+++ b/data/mirrors.cfg
@@ -15,6 +15,8 @@ ftp://old-releases.ubuntu.com/
 #commercial (both urls are valid)
 http://archive.canonical.com
 http://archive.canonical.com/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 137ee4a..d6309e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ubuntu-release-upgrader (1:18.04.40) bionic; 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: #1897778)
+
+ -- Chad Smith <[e-mail]>  Mon, 05 Oct 2020 14:50:15 -0600
+
 ubuntu-release-upgrader (1:18.04.39) bionic; urgency=medium
 
   * data/mirrors.cfg: add all ubuntu-advantage services as valid mirrors.
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()