diff -Nru ubuntu-release-upgrader-16.04.31/data/mirrors.cfg ubuntu-release-upgrader-16.04.32/data/mirrors.cfg --- ubuntu-release-upgrader-16.04.31/data/mirrors.cfg 2020-09-14 22:29:56.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/data/mirrors.cfg 2020-10-05 20:54:27.000000000 +0000 @@ -15,6 +15,8 @@ #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/ @@ -413,7 +415,6 @@ http://mirror.pit.teraswitch.com/ubuntu/ http://mirror.aktkn.sg/ubuntu/ http://hk.mirrors.thegigabit.com/ubuntu/ -http://quantum-mirror.hu/mirrors/pub/ubuntu/ http://mirrors.sth.sze.hu/ubuntu/ http://mirror.fsmg.org.nz/ubuntu/ http://mirrors.ukfast.co.uk/sites/archive.ubuntu.com/ @@ -446,7 +447,6 @@ http://mirror.funkfreundelandshut.de/ubuntu/ http://ir.ubuntu.sindad.cloud/ubuntu/ http://mirror.labkom.id/ubuntu/ -http://mirror.wff-gaming.de/ubuntu/ http://lug.mtu.edu/ubuntu/ http://repo.isra.edu.pk/ubuntu/ http://mirror.ubuntu.serverforge.org/ @@ -459,9 +459,7 @@ http://ubuntu.mirrors.theom.nz/ http://mirrors.xtom.nl/ubuntu/ http://mirror.deace.id/ubuntu/ -http://mirror.xaas.ir/ubuntu/ http://mirror.easyname.at/ubuntu-archive/ -http://kozyatagi.mirror.guzel.net.tr/ubuntu/ http://ftp.heanet.ie/pub/ubuntu/ http://no.mirrors.blix.com/ubuntu/ http://ubuntu.turhost.com/ubuntu/ @@ -481,7 +479,6 @@ http://mirrors.huaweicloud.com/repository/ubuntu/ http://mirrors.njupt.edu.cn/ubuntu/ http://us.mirror.nsec.pt/ubuntu/ -http://mirrors.nju.edu.cn/ubuntu/ http://mirror.plustech.de/ubuntu/ http://ubuntu.mirror.snu.edu.in/ubuntu/ http://mirrors.cqu.edu.cn/ubuntu/ @@ -497,7 +494,6 @@ http://mirrors.upr.edu/ubuntu/ http://buaya.klas.or.id/ubuntu/ http://mirror.il-pt.kamatera.com/ubuntu/ -https://ubuntu.itsbrasil.net/ubuntu/ https://mirror.provider.com.tr/ubuntu/ http://mirror.il.kamatera.com/ubuntu/ http://uk.mirror.worldbus.ge/ubuntu/ @@ -512,14 +508,12 @@ http://ntc.net.np/ubuntu/ http://mirror.eu.kamatera.com/ubuntu/ http://mirror.eu-fr.kamatera.com/ubuntu/ -http://mirror.0-1.cloud/ubuntu/ https://mirrors.ptisp.pt/ubuntu/ http://linux.xjtuns.cn/ubuntu/ http://ubuntu.mirror.rain.co.za/ubuntu/ http://mirror.ca-tr.kamatera.com/ubuntu/ http://mirror.chmuri.net/ubuntu/ http://mirror.hosthink.net/ubuntu/ -http://ubuntu.mirror.tn/ubuntu/ http://mirror.telcotech.com.kh/Linux/ubuntu-releases/ http://mirror.telkomuniversity.ac.id/ubuntu/ http://mirrors.nipa.cloud/ubuntu/ @@ -535,7 +529,6 @@ http://ftp.linux.cz/pub/linux/ubuntu/ http://mirror.us-ny2.kamatera.com/ubuntu/ http://mirror.eu-lo.kamatera.com/ubuntu/ -http://klid.dk/ftp/ubuntu/ http://mirror.il-rh.kamatera.com/ubuntu/ http://dafi.inf.um.es/ubuntu/ http://ubuntu.mirror.vio.sh/ubuntu/ @@ -547,7 +540,6 @@ https://mirrors.bkns.vn/ubuntu/ https://mirror.misakamikoto.network/ubuntu/ https://mirror.os6.org/ubuntu/ -http://ubuntu.mirror.ac.za/ https://ubuntu.ipserverone.com/ubuntu/ https://mirror.ubuntu.ikoula.com/ http://mirror.cov.ukservers.com/ubuntu/ @@ -564,9 +556,7 @@ http://uk.mirror.nsec.pt/ubuntu/ https://hr.mirror.kumi.systems/ubuntu/ https://mirror.iranserver.com/ubuntu/ -http://ubuntu.mirror.iodc.dk/ubuntu/ https://mirror.asergo.com/ubuntu/ -http://mirror.mizban.online/ubuntu/ https://mirrors.bfsu.edu.cn/ubuntu/ https://mirrors.gethosted.online/ubuntu/ https://mirror.misakamikoto.network/ubuntu-ports/ @@ -579,16 +569,13 @@ https://mirror.ufro.cl/ubuntu/ https://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ https://mirror.nl.leaseweb.net/ubuntu/ -http://mirror.iodc.dk/ubuntu/ https://fr.archive.ubuntu.com/ubuntu/ http://mirror.ihost.md/ubuntu/ -http://mirror.idealhosting.net.tr/ubuntu/ https://mirrors.hit.edu.cn/ubuntu/ https://ftp.harukasan.org/ubuntu-ports/ https://files.tux-users.net/ubuntu/ https://linux.yz.yamagata-u.ac.jp/ubuntu/ https://mirrors.avalonhosting.services/ubuntu-archive/ -http://ftp.twaren.net/Linux/Ubuntu/ubuntu/ https://al.mirror.kumi.systems/ubuntu/ https://mirror.kku.ac.th/ubuntu/ https://mirror.duvaliden.com/ubuntu/ @@ -598,3 +585,13 @@ http://mirror.fairway.ne.jp/ubuntu/ http://mirror.rcg.sfu.ca/mirror/ubuntu/ https://mirror.hodgepodge.dev/ubuntu/ +http://mirror.lagoon.nc/ubuntu/ +https://quantum-mirror.hu/mirrors/pub/ubuntu/ +http://mirror.rackcentral.com.au/ubuntu-archive/ +http://mirror.cedille.club/ubuntu/ +http://ubuntu.mirrors.skynet.be/ubuntu/ +https://mirror.dogado.de/ubuntu/ +https://ubuntu.mirror.ac.za/ +http://piotrkosoft.net/pub/mirrors/ubuntu/ +http://ubuntu.lagoon.nc/ubuntu/ +http://mirrors.gigenet.com/ubuntuarchive/ diff -Nru ubuntu-release-upgrader-16.04.31/debian/changelog ubuntu-release-upgrader-16.04.32/debian/changelog --- ubuntu-release-upgrader-16.04.31/debian/changelog 2020-09-14 22:29:56.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/debian/changelog 2020-10-05 20:54:27.000000000 +0000 @@ -1,3 +1,13 @@ +ubuntu-release-upgrader (1:16.04.32) xenial; 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 Mon, 05 Oct 2020 14:54:27 -0600 + ubuntu-release-upgrader (1:16.04.31) xenial; urgency=medium * data/mirrors.cfg: add all ubuntu-advantage services as valid mirrors. diff -Nru ubuntu-release-upgrader-16.04.31/DistUpgrade/DistUpgradeController.py ubuntu-release-upgrader-16.04.32/DistUpgrade/DistUpgradeController.py --- ubuntu-release-upgrader-16.04.31/DistUpgrade/DistUpgradeController.py 2019-10-02 14:08:25.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/DistUpgrade/DistUpgradeController.py 2020-10-05 20:54:27.000000000 +0000 @@ -1391,7 +1391,13 @@ """ 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): @@ -1404,7 +1410,9 @@ 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) """ logging.debug("abort called") diff -Nru ubuntu-release-upgrader-16.04.31/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-16.04.32/DistUpgrade/DistUpgradeVersion.py --- ubuntu-release-upgrader-16.04.31/DistUpgrade/DistUpgradeVersion.py 2020-09-14 22:29:56.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/DistUpgrade/DistUpgradeVersion.py 2020-10-05 20:54:27.000000000 +0000 @@ -1 +1 @@ -VERSION = '16.04.31' +VERSION = '16.04.32' diff -Nru ubuntu-release-upgrader-16.04.31/utils/update_mirrors.py ubuntu-release-upgrader-16.04.32/utils/update_mirrors.py --- ubuntu-release-upgrader-16.04.31/utils/update_mirrors.py 2020-09-14 22:29:54.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/utils/update_mirrors.py 2020-10-05 20:54:27.000000000 +0000 @@ -15,8 +15,8 @@ #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()