diff -Nru ubuntu-release-upgrader-16.04.30/data/mirrors.cfg ubuntu-release-upgrader-16.04.32/data/mirrors.cfg --- ubuntu-release-upgrader-16.04.30/data/mirrors.cfg 2020-05-01 23:06:05.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/data/mirrors.cfg 2020-10-05 20:54:27.000000000 +0000 @@ -16,6 +16,14 @@ 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/ +https://esm.ubuntu.com/infra/ubuntu/ +https://esm.ubuntu.com/fips/ubuntu/ +https://esm.ubuntu.com/fips-updates/ubuntu/ + #commercial-ppas https://private-ppa.launchpad.net/commercial-ppa-uploaders @@ -112,7 +120,6 @@ http://ubuntu.mirror.cambrium.nl/ubuntu/ http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/ http://ubuntu.osuosl.org/ubuntu/ -http://piotrkosoft.net/pub/mirrors/ubuntu/ http://ubuntu.univ-reims.fr/ubuntu/ http://archive.linux.duke.edu/ubuntu/ http://softlibre.unizar.es/ubuntu/archive/ @@ -136,11 +143,8 @@ http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://ubuntu.mirror.tudos.de/ubuntu/ -http://mirror.nl.leaseweb.net/ubuntu/ -http://mirror.us.leaseweb.net/ubuntu/ http://ftp.byfly.by/ubuntu/ http://mirror.datacenter.by/ubuntu/ -http://mirror.de.leaseweb.net/ubuntu/ http://mirror.lstn.net/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://mirror.serverloft.eu/ubuntu/ubuntu/ @@ -160,8 +164,6 @@ http://mirror.clibre.uqam.ca/ubuntu/ http://mirror.corbina.net/ubuntu/ http://mirror.cse.iitk.ac.in/ubuntu/ -http://mirror.its.sfu.ca/mirror/ubuntu/ -http://mirror.kku.ac.th/ubuntu/ http://mirror.metrocast.net/ubuntu/ http://mirror.sov.uk.goscomb.net/ubuntu/ http://mirror.telepoint.bg/ubuntu/ @@ -169,7 +171,6 @@ http://mirror.umd.edu/ubuntu/ http://mirror.unix-solutions.be/ubuntu/ http://mirrors.accretive-networks.net/ubuntu/ -http://mirrors.gigenet.com/ubuntuarchive/ http://mirrors.ircam.fr/pub/ubuntu/archive/ http://mirrors.mit.edu/ubuntu/ http://mirrors.syringanetworks.net/ubuntu-archive/ @@ -205,19 +206,15 @@ http://ubuntu.grena.ge/ubuntu/ http://ubuntu.tuxuri.com/ubuntu/ http://ubuntu.unc.edu.ar/ubuntu/ -http://ftp.neowiz.com/ubuntu/ http://ftp.uni-bayreuth.de/linux/ubuntu/ubuntu/ -http://mirror.ubuntu.ikoula.com/ubuntu/ http://suro.ubaya.ac.id/ubuntu/ http://archive.ubuntu.csg.uzh.ch/ubuntu/ http://ftp.nluug.nl/os/Linux/distr/ubuntu/ -http://mirror.tocici.com/ubuntu/ http://mirrors.advancedhosters.com/ubuntu/ http://ubuntu.mirror.constant.com/ http://ftp.cuhk.edu.hk/pub/Linux/ubuntu/ http://ftp.uni-mainz.de/ubuntu/ http://mirror.cogentco.com/pub/linux/ubuntu/ -http://mirror.easyspeedy.com/ubuntu/ http://mirror.overthewire.com.au/ubuntu/ http://mirror.unej.ac.id/ubuntu/ http://mirrors.arpnetworks.com/Ubuntu/ @@ -242,7 +239,6 @@ http://mirrors.aliyun.com/ubuntu/ http://archive.ubuntu.mirror.rafal.ca/ubuntu/ http://ftp.agh.edu.pl/ubuntu/ -http://ftp.yzu.edu.tw/ubuntu/ http://kebo.pens.ac.id/ubuntu/ http://mirror.as24220.net/pub/ubuntu/ http://mirror.cc.vt.edu/pub2/ubuntu/ @@ -268,7 +264,6 @@ http://mirror01.idc.hinet.net/ubuntu/ http://mirrors.asnet.am/ubuntu/ http://mirrors.nayatel.com/ubuntu/ -http://ubuntu.ipserverone.com/ubuntu/ http://opensource.xtdv.net/ubuntu/ http://reflector.westga.edu/repos/Ubuntu/archive/ http://mirror.plusserver.com/ubuntu/ubuntu/ @@ -294,7 +289,6 @@ http://ftp.aso.ee/ubuntu/ http://ftp.rezopole.net/ubuntu/ http://deb-mirror.habari.co.tz/ubuntu/ -http://ftp.utexas.edu/ubuntu/ http://giano.com.dist.unige.it/ubuntu/ http://mirror.math.princeton.edu/pub/ubuntu/ http://mirror.datacenter.az/ubuntu/ @@ -310,7 +304,6 @@ http://mirror.espol.edu.ec/ubuntu/ http://mirror.vnet.sk/ubuntu/ http://repos.forethought.net/ubuntu/ -http://mirror.os6.org/ubuntu/ http://ubuntu.mirror.ftn.uns.ac.rs/archive/ http://uk-mirrors.evowise.com/ubuntu/ http://mirror.wiru.co.za/ubuntu/ @@ -323,7 +316,6 @@ http://es-mirrors.evowise.com/ubuntu/ http://muug.ca/mirror/ubuntu/ http://mirrors.wikimedia.org/ubuntu/ -http://mirror.tcc.wa.edu.au/ubuntu/ http://mirror.intergrid.com.au/ubuntu/ http://mirrors.up.pt/ubuntu/ http://mirrors.cloud.linets.cl/ubuntu/ @@ -337,13 +329,11 @@ http://mirror.aminidc.com/ubuntu/ http://mirror.rasanegar.com/ubuntu/archive/ http://mirror.ratiokontakt.de/mirror/ubuntu/ -http://ubuntu.melbourneitmirror.net/archive/ http://mirror.nodesdirect.com/ubuntu/ http://ubuntu.bhs.mirrors.ovh.net/ubuntu/ http://mirror.poliwangi.ac.id/ubuntu/ http://mirror.truenetwork.ru/ubuntu/ http://mirror.datacenter.mn/ubuntu/ -http://ubuntu.archive.kw.zain.com/ http://mirrors.vhost.vn/ubuntu/ http://ubuntu.mirrors.ovh.net/ubuntu/ http://www.club.cc.cmu.edu/pub/ubuntu/ @@ -356,7 +346,6 @@ http://mirrors.bangmod.cloud/ubuntu/ http://mirror.as24220.net/pub/ubuntu-archive/ http://mirror.us-midwest-1.nexcess.net/ubuntu/ -http://ubuntu.hostiran.ir/ubuntuarchive/ http://mirror.aptus.co.tz/pub/ubuntuarchive/ http://mirror.ehost.vn/ubuntu/ http://mirror.retentionrange.co.bw/ubuntu/ @@ -369,7 +358,6 @@ http://ftp.lanet.kr/ubuntu/ http://ubuntu-arch.linux.edu.lv/ubuntu/ http://mirror.netsite.dk/ubuntu/archive/ -http://ftp.harukasan.org/ubuntu/ http://ubuntu.mirror.globo.tech/ http://mirror.xeonbd.com/ubuntu-archive/ http://mirror.vpsnet.com/ubuntu/ @@ -377,8 +365,6 @@ http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/ http://mirror.tedra.es/ubuntu/ http://mirrors.nxthost.com/ubuntu/ -http://linux.yz.yamagata-u.ac.jp/ubuntu/ -http://mirror.kumi.systems/ubuntu/ http://download.nust.na/pub/ubuntu/ubuntu/ http://mirror.wtnet.de/ubuntu/ http://mirror.enzu.com/ubuntu/ @@ -395,7 +381,6 @@ http://ftp.sh.cvut.cz/ubuntu/ http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/ http://packages.oth-regensburg.de/ubuntu/ -http://mozart.ee.ic.ac.uk/ubuntu-archive/ http://mirror.ps.kz/ubuntu/ http://mirror.armaghan.net/ubuntu/ http://ftp.upcnet.ro/mirrors/ubuntu.com/ubuntu/ @@ -405,7 +390,6 @@ http://mirrors.xtom.com/ubuntu/ http://mirror.init7.net/ubuntu/ http://mirror.mrjester.net/ubuntu/archive/ -http://repo.unpatti.ac.id/ubuntu/ http://mirror.xtom.com.hk/ubuntu/ http://ftp.rnl.tecnico.ulisboa.pt/pub/ubuntu/archive/ http://mirror.steadfastnet.com/ubuntu/ @@ -428,30 +412,25 @@ http://mirror.siena.edu/ubuntu/ http://mirrors.psu.ac.th/ubuntu/ http://mirrors.melbourne.co.uk/ubuntu/ -http://mirror.yongbok.net/ubuntu/ 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/ http://mirror.operationtulip.com/ubuntu/ http://mirrors.vcea.wsu.edu/ubuntu/ -http://mirror.ubuntu.ikoula.com/ http://mirror.docker.ru/ubuntu/ http://mirror.vcu.edu/pub/gnu+linux/ubuntu/ http://mirror.unimagdalena.edu.co/ubuntu/ http://miroir.univ-lorraine.fr/ubuntu/ http://mirrors.isu.net.sa/pub/ubuntu-releases/ -ftp://mirror.ricta.org.rw/ubuntu/ http://ftp.oleane.net/ubuntu/ http://mirror.serverion.com/ubuntu/ http://ftp.energotel.sk/pub/linux/ubuntu/ http://mirror.cs.unm.edu/archive/ http://mirrors.us.kernel.org/ubuntu/ http://mirrors.coreix.net/ubuntu/ -http://fr.archive.ubuntu.com/ubuntu/ http://mirror.lnx-solutions.com/ubuntu/ http://repos.del.extreme-ix.org/ubuntu/ http://repo.miserver.it.umich.edu/ubuntu/ @@ -468,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/ @@ -481,17 +459,13 @@ 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/ http://mirror.marwan.ma/ubuntu/ http://ubuntu-archive.mirrors.estointernet.in/ http://mirror.dataone.nl/ubuntu-archive/ -http://mirror.niif.hu/ubuntu/ -http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ http://ftp.fsn.hu/ubuntu/ http://mirror.23media.com/ubuntu/ http://mirror.realcompute.io/ubuntu/ @@ -505,13 +479,11 @@ 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/ http://ftp.sjtu.edu.cn/ubuntu/ http://archive.ubuntu.mirror.ba/ubuntu/ -http://archive.raptus-net.de/ubuntu/ http://linux.darkpenguin.net/distros/ubuntu-archive/ http://mirror.arizona.edu/ubuntu/ http://mirror-hk.koddos.net/ubuntu/ @@ -520,10 +492,8 @@ http://mirror.us-sc.kamatera.com/ubuntu/ https://ftp.csuc.cat/ubuntu/archieve/ http://mirrors.upr.edu/ubuntu/ -http://ubuntu.mirror.ac.za/ubuntu-archive/ 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/ @@ -533,24 +503,17 @@ http://mirrors.c0urier.net/linux/ubuntu/ http://mirror.yer.az/ubuntu/ http://repo.jztkft.hu/ubuntu/ -http://mirrors.codec-cluster.org/ubuntu/ -http://ubuntu.maxime.vip/ubuntu/ http://plug-mirror.rcac.purdue.edu/ubuntu/ http://mirror.efect.ro/ubuntu/archive/ 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://mirror.exid.us/ubuntu-archive/ http://ubuntu.mirror.rain.co.za/ubuntu/ -https://xd.dog/mirror/ubuntu/ -http://mirrors.bfsu.edu.cn/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/ @@ -565,11 +528,70 @@ http://mirror.as.kamatera.com/ubuntu/ http://ftp.linux.cz/pub/linux/ubuntu/ http://mirror.us-ny2.kamatera.com/ubuntu/ -http://mirror.iranserver.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.acehprov.go.id/ubuntu/ http://ubuntu.mirror.vio.sh/ubuntu/ http://cesium.di.uminho.pt/pub/ubuntu-archive/ +https://mirror.de.leaseweb.net/ubuntu/ +https://si.mirror.kumi.systems/ubuntu/ +https://ubuntu.shatel.ir/ubuntu/ +https://mirror.sh.com.tr/ubuntu/ +https://mirrors.bkns.vn/ubuntu/ +https://mirror.misakamikoto.network/ubuntu/ +https://mirror.os6.org/ubuntu/ +https://ubuntu.ipserverone.com/ubuntu/ +https://mirror.ubuntu.ikoula.com/ +http://mirror.cov.ukservers.com/ubuntu/ +https://mirror.kumi.systems/ubuntu/ +http://ftp.mirror.tw/pub/ubuntu/ubuntu/ +http://mirror.lcsee.wvu.edu/ubuntu/ +https://ftp.ps.pl/pub/Linux/ubuntu/archive/ +http://tux.rainside.sk/ubuntu/ +http://mirror1.cl.netactuate.com/ubuntu/ +https://mirrors.switch.ca/ubuntu/ +https://mirror.kumi.systems/ubuntu-ports/ +https://ftp.harukasan.org/ubuntu/ +https://twitchdarkbot.com/ubuntu/ +http://uk.mirror.nsec.pt/ubuntu/ +https://hr.mirror.kumi.systems/ubuntu/ +https://mirror.iranserver.com/ubuntu/ +https://mirror.asergo.com/ubuntu/ +https://mirrors.bfsu.edu.cn/ubuntu/ +https://mirrors.gethosted.online/ubuntu/ +https://mirror.misakamikoto.network/ubuntu-ports/ +https://mirror.us.leaseweb.net/ubuntu/ +https://mirror.gi.co.id/ubuntu/ +https://mirror.yongbok.net/ubuntu/ +https://mirror.googel.life/ubuntu/archive/ +https://pinguin.dinus.ac.id/iso/ubuntu/repo/ +https://mirror.niif.hu/ubuntu/ +https://mirror.ufro.cl/ubuntu/ +https://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ +https://mirror.nl.leaseweb.net/ubuntu/ +https://fr.archive.ubuntu.com/ubuntu/ +http://mirror.ihost.md/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/ +https://al.mirror.kumi.systems/ubuntu/ +https://mirror.kku.ac.th/ubuntu/ +https://mirror.duvaliden.com/ubuntu/ +https://twitchdarkbot.com/ubuntu-ports/ +https://rs.mirror.kumi.systems/ubuntu/ +https://mirror.papua.go.id/ubuntu/ +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.30/debian/changelog ubuntu-release-upgrader-16.04.32/debian/changelog --- ubuntu-release-upgrader-16.04.30/debian/changelog 2020-05-01 23:06:05.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/debian/changelog 2020-10-05 20:54:27.000000000 +0000 @@ -1,3 +1,21 @@ +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. + This includes: fips, fips-updates, esm-infra, esm-apps and cc-eal. + (LP: #1893717) + + -- Brian Murray Mon, 14 Sep 2020 15:29:56 -0700 + ubuntu-release-upgrader (1:16.04.30) xenial; urgency=medium * debian/control: change ubuntu-release-upgrader-core to depend on diff -Nru ubuntu-release-upgrader-16.04.30/DistUpgrade/DistUpgradeController.py ubuntu-release-upgrader-16.04.32/DistUpgrade/DistUpgradeController.py --- ubuntu-release-upgrader-16.04.30/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.30/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-16.04.32/DistUpgrade/DistUpgradeVersion.py --- ubuntu-release-upgrader-16.04.30/DistUpgrade/DistUpgradeVersion.py 2020-05-01 23:06:05.000000000 +0000 +++ ubuntu-release-upgrader-16.04.32/DistUpgrade/DistUpgradeVersion.py 2020-10-05 20:54:27.000000000 +0000 @@ -1 +1 @@ -VERSION = '16.04.30' +VERSION = '16.04.32' diff -Nru ubuntu-release-upgrader-16.04.30/utils/update_mirrors.py ubuntu-release-upgrader-16.04.32/utils/update_mirrors.py --- ubuntu-release-upgrader-16.04.30/utils/update_mirrors.py 2019-10-02 14:08:25.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 23 lines are permanent -permanent_lines = 22 +# the first 31 lines are permanent +permanent_lines = 31 lp_mirrors = set() new_mirrors = set()