Updates for 20.04.1 (#226)

hakuna-m · Sep 6, 2020 · 4f183a8 · 4f183a8
2 parents 8df502a + 12bcdb1
commit 4f183a8
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 61 deletions.
diff --git a/data/isolist.ini b/data/isolist.ini
@@ -5,8 +5,8 @@ kernel=casper/vmlinuz
 initrd=casper/initrd
 files_to_check=casper/filesystem.squashfs
 md5sums=md5sum.txt
-metalink_md5sums=MD5SUMS-metalink
-metalink_md5sums_signature=MD5SUMS-metalink.gpg
+metalink_md5sums=SHA256SUMS
+metalink_md5sums_signature=SHA256SUMS.gpg
 size=0
 min_iso_size=900000000
 max_iso_size=1900000000
@@ -21,8 +21,8 @@ max_iso_size=1700000000
 arch=i386
 name=Ubuntu
 packages=ubuntu-desktop
-metalink=http://releases.ubuntu.com/20.04.1/ubuntu-20.04.1-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-i386.metalink
+metalink=http://releases.ubuntu.com/20.04.1/ubuntu-20.04.1-desktop-i386.list
+metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-i386.list
 website=http://www.ubuntu.com
 ordering=1
 
@@ -31,8 +31,8 @@ max_iso_size=1700000000
 arch=amd64
 name=Ubuntu
 packages=ubuntu-desktop
-metalink=http://releases.ubuntu.com/20.04.1/ubuntu-20.04.1-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-amd64.metalink
+metalink=http://releases.ubuntu.com/20.04.1/ubuntu-20.04.1-desktop-amd64.list
+metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://www.ubuntu.com
 ordering=1
 
@@ -41,8 +41,8 @@ max_iso_size=1800000000
 arch=i386
 name=Kubuntu
 packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.1/release/kubuntu-20.04.1-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/kubuntu/focal/daily-live/pending/focal-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.1/release/kubuntu-20.04.1-desktop-i386.list
+metalink2=http://cdimage.ubuntu.com/kubuntu/focal/daily-live/pending/focal-desktop-i386.list
 website=http://www.kubuntu.org
 ordering=3
 
@@ -51,8 +51,8 @@ max_iso_size=1800000000
 arch=amd64
 name=Kubuntu
 packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.1/release/kubuntu-20.04.1-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/kubuntu/focal/daily-live/pending/focal-desktop-amd64.metalink
+metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.1/release/kubuntu-20.04.1-desktop-amd64.list
+metalink2=http://cdimage.ubuntu.com/kubuntu/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://www.kubuntu.org
 ordering=3
 
@@ -61,8 +61,8 @@ max_iso_size=1300000000
 arch=i386
 name=Xubuntu
 packages=xubuntu-desktop
-metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.1/release/xubuntu-20.04.1-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/xubuntu/focal/daily-live/pending/focal-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.1/release/xubuntu-20.04.1-desktop-i386.list
+metalink2=http://cdimage.ubuntu.com/xubuntu/focal/daily-live/pending/focal-desktop-i386.list
 website=http://www.xubuntu.org
 ordering=4
 
@@ -71,8 +71,8 @@ max_iso_size=1300000000
 arch=amd64
 name=Xubuntu
 packages=xubuntu-desktop
-metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.1/release/xubuntu-20.04.1-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/xubuntu/focal/daily-live/pending/focal-desktop-amd64.metalink
+metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.1/release/xubuntu-20.04.1-desktop-amd64.list
+metalink2=http://cdimage.ubuntu.com/xubuntu/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://www.xubuntu.org
 ordering=4
 
@@ -81,8 +81,8 @@ max_iso_size=1500000000
 arch=i386
 name=Ubuntu Budgie
 packages=budgie-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.1/release/ubuntu-budgie-20.04.1-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/focal/daily-live/pending/focal-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.1/release/ubuntu-budgie-20.04.1-desktop-i386.list
+metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/focal/daily-live/pending/focal-desktop-i386.list
 website=http://ubuntubudgie.org
 ordering=5
 
@@ -91,8 +91,8 @@ max_iso_size=1500000000
 arch=amd64
 name=Ubuntu Budgie
 packages=budgie-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.1/release/ubuntu-budgie-20.04.1-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/focal/daily-live/pending/focal-desktop-amd64.metalink
+metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.1/release/ubuntu-budgie-20.04.1-desktop-amd64.list
+metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://ubuntubudgie.org
 ordering=5
 
@@ -101,8 +101,8 @@ max_iso_size=1000000000
 arch=i386
 name=Lubuntu
 packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.1/release/lubuntu-20.04.1-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.1/release/lubuntu-20.04.1-desktop-i386.list
+metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-i386.list
 website=http://lubuntu.net
 ordering=7
 
@@ -111,8 +111,8 @@ max_iso_size=1000000000
 arch=amd64
 name=Lubuntu
 packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.1/release/lubuntu-20.04.1-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-amd64.metalink
+metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.1/release/lubuntu-20.04.1-desktop-amd64.list
+metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://lubuntu.net
 ordering=7
 
@@ -123,8 +123,8 @@ min_memory_mb=512
 arch=i386
 name=Ubuntu Studio
 packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.1/release/ubuntustudio-20.04.1-dvd-i386.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-i386.metalink
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.1/release/ubuntustudio-20.04.1-dvd-i386.list
+metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-i386.list
 website=http://ubuntustudio.org
 ordering=8
 
@@ -135,8 +135,8 @@ min_memory_mb=512
 arch=amd64
 name=Ubuntu Studio
 packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.1/release/ubuntustudio-20.04.1-dvd-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-amd64.metalink
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.1/release/ubuntustudio-20.04.1-dvd-amd64.list
+metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-amd64.list
 website=http://ubuntustudio.org
 ordering=8
 
@@ -145,8 +145,8 @@ max_iso_size=1900000000
 arch=i386
 name=Ubuntu MATE
 packages=ubuntu-mate-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.1/release/ubuntu-mate-20.04.1-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntu-mate/focal/daily-live/pending/focal-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.1/release/ubuntu-mate-20.04.1-desktop-i386.list
+metalink2=http://cdimage.ubuntu.com/ubuntu-mate/focal/daily-live/pending/focal-desktop-i386.list
 website=http://ubuntu-mate.org/
 ordering=9
 
@@ -155,8 +155,8 @@ max_iso_size=1900000000
 arch=amd64
 name=Ubuntu MATE
 packages=ubuntu-mate-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.1/release/ubuntu-mate-20.04.1-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntu-mate/focal/daily-live/pending/focal-desktop-amd64.metalink
+metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.1/release/ubuntu-mate-20.04.1-desktop-amd64.list
+metalink2=http://cdimage.ubuntu.com/ubuntu-mate/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://ubuntu-mate.org
 ordering=9
 
@@ -165,8 +165,8 @@ max_iso_size=1600000000
 arch=i386
 name=Ubuntu Kylin
 packages=ubuntukylin-desktop
-metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.1/release/ubuntukylin-20.04.1-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntukylin/focal/daily-live/pending/focal-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.1/release/ubuntukylin-20.04.1-desktop-i386.list
+metalink2=http://cdimage.ubuntu.com/ubuntukylin/focal/daily-live/pending/focal-desktop-i386.list
 website=http://www.ubuntukylin.com
 ordering=A
 
@@ -175,8 +175,8 @@ max_iso_size=1600000000
 arch=amd64
 name=Ubuntu Kylin
 packages=ubuntukylin-desktop
-metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.1/release/ubuntukylin-20.04.1-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntukylin/focal/daily-live/pending/focal-desktop-amd64.metalink
+metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.1/release/ubuntukylin-20.04.1-desktop-amd64.list
+metalink2=http://cdimage.ubuntu.com/ubuntukylin/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://www.ubuntukylin.com
 ordering=A
 
@@ -185,8 +185,8 @@ version=
 arch=i386
 name=Wubi
 packages=
-metalink=20.04.1-desktop-i386.metalink
-metalink2=focal-desktop-i386.metalink
+metalink=20.04.1-desktop-i386.list
+metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=U
@@ -196,8 +196,8 @@ version=
 arch=amd64
 name=Wubi
 packages=
-metalink=20.04.1-desktop-amd64.metalink
-metalink2=focal-desktop-amd64.metalink
+metalink=20.04.1-desktop-amd64.list
+metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=U
@@ -208,8 +208,8 @@ arch=i386
 name=Wubi lz
 packages=
 initrd=casper/initrd.lz
-metalink=20.04.1-desktop-i386.metalink
-metalink2=focal-desktop-i386.metalink
+metalink=20.04.1-desktop-i386.list
+metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=V
@@ -220,8 +220,8 @@ arch=amd64
 name=Wubi lz
 packages=
 initrd=casper/initrd.lz
-metalink=20.04.1-desktop-amd64.metalink
-metalink2=focal-desktop-amd64.metalink
+metalink=20.04.1-desktop-amd64.list
+metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=V
@@ -233,8 +233,8 @@ name=Wubi EFI
 packages=
 kernel=casper/vmlinuz.efi
 initrd=casper/initrd.lz
-metalink=20.04.1-desktop-i386.metalink
-metalink2=focal-desktop-i386.metalink
+metalink=20.04.1-desktop-i386.list
+metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=W
@@ -246,8 +246,8 @@ name=Wubi EFI
 packages=
 kernel=casper/vmlinuz.efi
 initrd=casper/initrd.lz
-metalink=20.04.1-desktop-amd64.metalink
-metalink2=focal-desktop-amd64.metalink
+metalink=20.04.1-desktop-amd64.list
+metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=W
@@ -259,8 +259,8 @@ name=Wubi MD5
 packages=
 initrd=casper/initrd.lz
 md5sums=MD5SUMS
-metalink=20.04.1-desktop-i386.metalink
-metalink2=focal-desktop-i386.metalink
+metalink=20.04.1-desktop-i386.list
+metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=X
@@ -272,8 +272,8 @@ name=Wubi MD5
 packages=
 initrd=casper/initrd.lz
 md5sums=MD5SUMS
-metalink=20.04.1-desktop-amd64.metalink
-metalink2=focal-desktop-amd64.metalink
+metalink=20.04.1-desktop-amd64.list
+metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=X
@@ -284,8 +284,8 @@ arch=i386
 name=Wubi gz
 packages=
 initrd=casper/initrd.gz
-metalink=20.04.1-desktop-i386.metalink
-metalink2=focal-desktop-i386.metalink
+metalink=20.04.1-desktop-i386.list
+metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=Y
@@ -296,8 +296,8 @@ arch=amd64
 name=Wubi gz
 packages=
 initrd=casper/initrd.gz
-metalink=20.04.1-desktop-amd64.metalink
-metalink2=focal-desktop-amd64.metalink
+metalink=20.04.1-desktop-amd64.list
+metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=Y
@@ -309,8 +309,8 @@ name=Wubi SHA256
 packages=
 initrd=casper/initrd.lz
 md5sums=SHA256SUMS
-metalink=20.04.1-desktop-i386.metalink
-metalink2=focal-desktop-i386.metalink
+metalink=20.04.1-desktop-i386.list
+metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=Z
@@ -322,8 +322,9 @@ name=Wubi SHA256
 packages=
 initrd=casper/initrd.lz
 md5sums=SHA256SUMS
-metalink=20.04.1-desktop-amd64.metalink
-metalink2=focal-desktop-amd64.metalink
+metalink=20.04.1-desktop-amd64.list
+metalink2=focal-desktop-amd64.list
+
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=Z
diff --git a/data/list.metalink b/data/list.metalink
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="http://download.eclipse.org/eclipse/metalink.xsl"?>
+<metalink version="3.0" xmlns="http://www.metalinker.org/">
+  <files>
+    <file name=" ">
+      <verification>
+        <hash type=" "> </hash>
+      </verification>
+      <resources maxconnections="1">
+	<url type="bittorrent" preference="200"> </url>
+	<url type="http"> </url>
+      </resources>
+    </file>
+  </files>
+</metalink>
diff --git a/debian/changelog b/debian/changelog
@@ -1,9 +1,15 @@
-wubi (20.04.1r340) focal; urgency=low
+wubi (20.04.1r341) focal; urgency=low
 
   [Hakuna Matata]
 
   * Update to 20.04.1 (#226)
 
+wubi (20.04r341) focal; urgency=low
+
+  [Hakuna Matata]
+
+  * metalink for .list instead of missing .metalink files (#226)
+
 wubi (20.04r340) focal; urgency=low
 
   [Hakuna Matata]

diff --git a/src/urlgrabber/keepalive.py b/src/urlgrabber/keepalive.py
@@ -347,7 +347,8 @@ def https_open(self, req):
         return self.do_open(req)
 
     def _get_connection(self, host):
-        return self._ssl_factory.get_https_connection(host)
+        try: return self._ssl_factory.get_https_connection(host)
+        except AttributeError: return HTTPSConnection(host)
 
 class HTTPResponse(httplib.HTTPResponse):
     # we need to subclass HTTPResponse in order to

diff --git a/src/wubi/backends/common/backend.py b/src/wubi/backends/common/backend.py
@@ -284,6 +284,10 @@ def check_metalink(self, metalink, base_url, associated_task=None):
             hash_name = 'sha' + str(hash_len)
         else:
             hash_name = 'md5'
+        if self.info.distro.metalink:
+           self.info.distro.metalink.files[0].hashes[0].type = hash_name
+           self.info.distro.metalink.files[0].hashes[0].hash = hashsum
+           return True
         hashsum2 = get_file_hash(metalink, hash_name)
         if hashsum != hashsum2:
             log.error("The %s of the metalink does not match (%s != %s)" % (hash_name, hashsum, hashsum2))
@@ -466,9 +470,17 @@ def get_metalink(self, associated_task=None):
             except Exception, err:
                 log.error("Cannot download metalink file2 %s err=%s" % (url, err))
                 return
+        metalink_filename, metalink_extension = os.path.splitext(metalink)
+        if metalink_extension == '.list':
+            self.info.distro.metalink = parse_metalink(join_path(self.info.data_dir, 'list.metalink'))
+            metalink = metalink_filename + ".iso"
+            self.info.distro.metalink.files[0].name = os.path.basename(metalink)
+            self.info.distro.metalink.files[0].urls[0].url = base_url + "/" + self.info.distro.metalink.files[0].name + ".torrent"
+            self.info.distro.metalink.files[0].urls[1].url = base_url + "/" + self.info.distro.metalink.files[0].name
         if not self.check_metalink(metalink, base_url):
             log.exception("Cannot authenticate the metalink file, it might be corrupt")
-        self.info.distro.metalink = parse_metalink(metalink)
+        if not self.info.distro.metalink:
+            self.info.distro.metalink = parse_metalink(metalink)
 
     def get_prespecified_diskimage(self, associated_task):
         '''