diff -Nru ubuntu-release-upgrader-18.04.33/data/mirrors.cfg ubuntu-release-upgrader-18.04.34/data/mirrors.cfg --- ubuntu-release-upgrader-18.04.33/data/mirrors.cfg 2019-05-15 17:37:15.000000000 +0000 +++ ubuntu-release-upgrader-18.04.34/data/mirrors.cfg 2019-06-19 16:49:56.000000000 +0000 @@ -98,7 +98,6 @@ http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/ http://ftp-stud.hs-esslingen.de/ubuntu/ http://ubuntu.otenet.gr/ -http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ http://ftp.jaist.ac.jp/pub/Linux/ubuntu/ http://ubuntu.grn.cat/ubuntu/ http://ubuntu.positive-internet.com/ubuntu/ @@ -283,7 +282,6 @@ http://mirror.fairway.ne.jp/ubuntu/ http://mirror.idealhosting.net.tr/ubuntu/ http://pkg.adfinis-sygroup.ch/ubuntu/ -http://ftp.ntua.gr/ubuntu/ http://mirror.stw-aachen.de/ubuntu/ http://mirrors.tuna.tsinghua.edu.cn/ubuntu/ http://mirror.netspace.net.au/pub/ubuntu/ @@ -415,14 +413,12 @@ http://mirrors.layeronline.com/ubuntu/ http://repo.unpatti.ac.id/ubuntu/ http://ftp.heanet.ie/pub/ubuntu/ -http://mirror.iodc.dk/ubuntu/ http://mirror.ehost.vn/ubuntu/ http://mirror.ps.kz/ubuntu/ http://mirror.kamp.de/ubuntu/ http://mirror.team-cymru.com/ubuntu/ http://mirror.cs.jmu.edu/pub/ubuntu/ http://mirrors.cat.pdx.edu/ubuntu/ -http://mirrors.nju.edu.cn/ubuntu/ http://mirrors.ulbsibiu.ro/ubuntu/ http://mirror.onevip.mk/ubuntu/ http://mirrors.huaweicloud.com/repository/ubuntu/ @@ -447,7 +443,6 @@ http://mirror.mrjester.net/ubuntu/archive/ http://mirrors.xtom.com/ubuntu/ http://aze.archive.ubuntu.com/ubuntu/ -http://mirror.as24220.net/pub/ubuntu-archive/ http://mirror.as24220.net/pub/ubuntu/ http://mirror.linux.pizza/ubuntu/ http://mozart.ee.ic.ac.uk/ubuntu-archive/ @@ -517,7 +512,27 @@ http://mirrors.melbourne.co.uk/ubuntu/ http://ubuntu.securedservers.com/ http://mirrors.sth.sze.hu/ubuntu/ -http://mirrors4.fnl.bupt.maojianwei.com/ http://ftp.utexas.edu/ubuntu/ http://mirror.xaas.ir/ubuntu/ http://mirror.thaidns.co.th/ubuntu/ +http://miroir.univ-lorraine.fr/ubuntu/ +http://mirror.ubuntu.serverforge.org/ +http://mirror.ufscar.br/ubuntu/ +http://mirror.lnx-solutions.com/ubuntu/ +ftp://mirrors.fnl.bupt.maojianwei.com/Ubuntu_apt_mirror/ +http://ftp.rezopole.net/ubuntu/ +http://mirror.aktkn.sg/ubuntu/ +http://mirror.espol.edu.ec/ubuntu/ +http://mirror.ni.net.tr/ubuntu/ +http://download.nus.edu.sg/mirror/ubuntu/ +http://repo.isra.edu.pk/ubuntu/ +http://ftp.linux.org.tr/ubuntu/ +http://mirror.metrocast.net/ubuntu/ +http://mirror.hostdime.com.br/ubuntu/ +http://mirror.serverion.com/ubuntu/ +http://mirror.ubuntu.ikoula.com/ +http://mirror.pit.teraswitch.com/ubuntu/ +http://ubuntu.anexia.at/ubuntu/ +http://mirror.cs.unm.edu/archive/ +http://mirror.docker.ru/ubuntu/ +http://mirrors.sohu.com/ubuntu/ diff -Nru ubuntu-release-upgrader-18.04.33/debian/changelog ubuntu-release-upgrader-18.04.34/debian/changelog --- ubuntu-release-upgrader-18.04.33/debian/changelog 2019-05-15 17:37:15.000000000 +0000 +++ ubuntu-release-upgrader-18.04.34/debian/changelog 2019-06-19 16:49:56.000000000 +0000 @@ -1,3 +1,10 @@ +ubuntu-release-upgrader (1:18.04.34) bionic; urgency=medium + + * DistUpgrade/DistUpgradeQuirks.py: only try to install snaps if snapstore + is reachable. (LP: #1831933) + + -- Dan Streetman Wed, 19 Jun 2019 12:49:56 -0400 + ubuntu-release-upgrader (1:18.04.33) bionic; urgency=medium * DistUpgrade/DistUpgradeViewNonInteractive.py: when responding to a diff -Nru ubuntu-release-upgrader-18.04.33/DistUpgrade/apt_btrfs_snapshot.py ubuntu-release-upgrader-18.04.34/DistUpgrade/apt_btrfs_snapshot.py --- ubuntu-release-upgrader-18.04.33/DistUpgrade/apt_btrfs_snapshot.py 2019-05-15 17:37:15.000000000 +0000 +++ ubuntu-release-upgrader-18.04.34/DistUpgrade/apt_btrfs_snapshot.py 2019-06-19 16:49:56.000000000 +0000 @@ -184,7 +184,7 @@ If "older_then" is given (in unixtime format) it will only include snapshots that are older then the given date) """ - result = [] + l = [] # if older_than is used, ensure that the rootfs does not use # "noatime" if older_than != 0: @@ -203,9 +203,9 @@ # created (to check if there is support for btrfs) atime = os.path.getatime(os.path.join(mp, e, "etc", "fstab")) if atime < older_than: - result.append(e) + l.append(e) self.umount_btrfs_root_volume() - return result + return l def print_btrfs_root_snapshots(self): print("Available snapshots:") diff -Nru ubuntu-release-upgrader-18.04.33/DistUpgrade/DistUpgradeQuirks.py ubuntu-release-upgrader-18.04.34/DistUpgrade/DistUpgradeQuirks.py --- ubuntu-release-upgrader-18.04.33/DistUpgrade/DistUpgradeQuirks.py 2018-08-28 22:46:50.000000000 +0000 +++ ubuntu-release-upgrader-18.04.34/DistUpgrade/DistUpgradeQuirks.py 2019-06-19 16:49:56.000000000 +0000 @@ -62,6 +62,7 @@ self._poke = None self._uid = '' self._user_env = {} + self._snapstore_reachable = False # the quirk function have the name: # $Name (e.g. PostUpgrade) @@ -146,7 +147,8 @@ logging.debug("package required for Quirk not in cache") return if cache['ubuntu-desktop'].is_installed and \ - cache['snapd'].is_installed: + cache['snapd'].is_installed and \ + self._snapstore_reachable: self._replaceDebsWithSnaps() # individual quirks handler when the dpkg run is finished --------- @@ -506,6 +508,7 @@ stderr=PIPE, env=snap_env, universal_newlines=True).communicate() if re.search("^ \* PASS", connected[0], re.MULTILINE): + self._snapstore_reachable = True return # can't connect elif re.search("^ \*.*unreachable", connected[0], re.MULTILINE): diff -Nru ubuntu-release-upgrader-18.04.33/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-18.04.34/DistUpgrade/DistUpgradeVersion.py --- ubuntu-release-upgrader-18.04.33/DistUpgrade/DistUpgradeVersion.py 2019-05-15 17:37:15.000000000 +0000 +++ ubuntu-release-upgrader-18.04.34/DistUpgrade/DistUpgradeVersion.py 2019-06-19 16:49:56.000000000 +0000 @@ -1 +1 @@ -VERSION = '18.04.33' +VERSION = '18.04.34' diff -Nru ubuntu-release-upgrader-18.04.33/tests/data-sources-list-test/sources.list ubuntu-release-upgrader-18.04.34/tests/data-sources-list-test/sources.list --- ubuntu-release-upgrader-18.04.33/tests/data-sources-list-test/sources.list 2019-05-15 17:37:15.000000000 +0000 +++ ubuntu-release-upgrader-18.04.34/tests/data-sources-list-test/sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu gutsy main restricted -deb http://archive.ubuntu.com/ubuntu gutsy-updates main restricted -deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted -# A PPA with a unicode comment -# deb http://ppa.launchpad.net/random-ppa quantal main # ppa of Víctor R. Ruiz (vrruiz) disabled on upgrade to gutsy