isolist.ini for 20.04.3

hakuna-m · Aug 26, 2021 · 4f49b5d · 4f49b5d
2 parents a362c72 + ef64d2c
commit 4f49b5d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/data/isolist.ini b/data/isolist.ini
@@ -21,7 +21,7 @@ max_iso_size=1700000000
 arch=i386
 name=Ubuntu
 packages=ubuntu-desktop
-metalink=http://releases.ubuntu.com/20.04.2.0/ubuntu-20.04.2.0-desktop-i386.list
+metalink=http://releases.ubuntu.com/20.04.3/ubuntu-20.04.3-desktop-i386.list
 metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-i386.list
 website=http://www.ubuntu.com
 ordering=1
@@ -31,7 +31,7 @@ max_iso_size=1700000000
 arch=amd64
 name=Ubuntu
 packages=ubuntu-desktop
-metalink=http://releases.ubuntu.com/20.04.2.0/ubuntu-20.04.2.0-desktop-amd64.list
+metalink=http://releases.ubuntu.com/20.04.3/ubuntu-20.04.3-desktop-amd64.list
 metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://www.ubuntu.com
 ordering=1
@@ -41,7 +41,7 @@ max_iso_size=1800000000
 arch=i386
 name=Kubuntu
 packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.2.0/release/kubuntu-20.04.2.0-desktop-i386.list
+metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.3/release/kubuntu-20.04.3-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,7 +51,7 @@ max_iso_size=1800000000
 arch=amd64
 name=Kubuntu
 packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.2.0/release/kubuntu-20.04.2.0-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.3/release/kubuntu-20.04.3-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,7 +61,7 @@ max_iso_size=1300000000
 arch=i386
 name=Xubuntu
 packages=xubuntu-desktop
-metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.2.0/release/xubuntu-20.04.2.0-desktop-i386.list
+metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.3/release/xubuntu-20.04.3-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,7 +71,7 @@ max_iso_size=1300000000
 arch=amd64
 name=Xubuntu
 packages=xubuntu-desktop
-metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.2.0/release/xubuntu-20.04.2.0-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.3/release/xubuntu-20.04.3-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,7 +81,7 @@ max_iso_size=1500000000
 arch=i386
 name=Ubuntu Budgie
 packages=budgie-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.2.0/release/ubuntu-budgie-20.04.2.0-desktop-i386.list
+metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.3/release/ubuntu-budgie-20.04.3-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,7 +91,7 @@ max_iso_size=1500000000
 arch=amd64
 name=Ubuntu Budgie
 packages=budgie-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.2.0/release/ubuntu-budgie-20.04.2.0-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.3/release/ubuntu-budgie-20.04.3-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,7 +101,7 @@ max_iso_size=1000000000
 arch=i386
 name=Lubuntu
 packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.2.0/release/lubuntu-20.04.2.0-desktop-i386.list
+metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.3/release/lubuntu-20.04.3-desktop-i386.list
 metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-i386.list
 website=http://lubuntu.net
 ordering=7
@@ -111,7 +111,7 @@ max_iso_size=1000000000
 arch=amd64
 name=Lubuntu
 packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.2.0/release/lubuntu-20.04.2.0-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.3/release/lubuntu-20.04.3-desktop-amd64.list
 metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-amd64.list
 website=http://lubuntu.net
 ordering=7
@@ -123,7 +123,7 @@ min_memory_mb=512
 arch=i386
 name=Ubuntu Studio
 packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.2.0/release/ubuntustudio-20.04.2.0-dvd-i386.list
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.3/release/ubuntustudio-20.04.3-dvd-i386.list
 metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-i386.list
 website=http://ubuntustudio.org
 ordering=8
@@ -135,7 +135,7 @@ min_memory_mb=512
 arch=amd64
 name=Ubuntu Studio
 packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.2.0/release/ubuntustudio-20.04.2.0-dvd-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.3/release/ubuntustudio-20.04.3-dvd-amd64.list
 metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-amd64.list
 website=http://ubuntustudio.org
 ordering=8
@@ -145,7 +145,7 @@ max_iso_size=1900000000
 arch=i386
 name=Ubuntu MATE
 packages=ubuntu-mate-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.2.0/release/ubuntu-mate-20.04.2.0-desktop-i386.list
+metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.3/release/ubuntu-mate-20.04.3-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,7 +155,7 @@ max_iso_size=1900000000
 arch=amd64
 name=Ubuntu MATE
 packages=ubuntu-mate-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.2.0/release/ubuntu-mate-20.04.2.0-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.3/release/ubuntu-mate-20.04.3-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,7 +165,7 @@ max_iso_size=1600000000
 arch=i386
 name=Ubuntu Kylin
 packages=ubuntukylin-desktop
-metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.2.0/release/ubuntukylin-20.04.2.0-desktop-i386.list
+metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.3/release/ubuntukylin-20.04.3-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,7 +175,7 @@ max_iso_size=1600000000
 arch=amd64
 name=Ubuntu Kylin
 packages=ubuntukylin-desktop
-metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.2.0/release/ubuntukylin-20.04.2.0-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.3/release/ubuntukylin-20.04.3-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,7 +185,7 @@ version=
 arch=i386
 name=Wubi
 packages=
-metalink=20.04.2.0-desktop-i386.list
+metalink=20.04.3-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -196,7 +196,7 @@ version=
 arch=amd64
 name=Wubi
 packages=
-metalink=20.04.2.0-desktop-amd64.list
+metalink=20.04.3-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -208,7 +208,7 @@ arch=i386
 name=Wubi lz
 packages=
 initrd=casper/initrd.lz
-metalink=20.04.2.0-desktop-i386.list
+metalink=20.04.3-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -220,7 +220,7 @@ arch=amd64
 name=Wubi lz
 packages=
 initrd=casper/initrd.lz
-metalink=20.04.2.0-desktop-amd64.list
+metalink=20.04.3-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -233,7 +233,7 @@ name=Wubi EFI
 packages=
 kernel=casper/vmlinuz.efi
 initrd=casper/initrd.lz
-metalink=20.04.2.0-desktop-i386.list
+metalink=20.04.3-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -246,7 +246,7 @@ name=Wubi EFI
 packages=
 kernel=casper/vmlinuz.efi
 initrd=casper/initrd.lz
-metalink=20.04.2.0-desktop-amd64.list
+metalink=20.04.3-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -259,7 +259,7 @@ name=Wubi MD5
 packages=
 initrd=casper/initrd.lz
 md5sums=MD5SUMS
-metalink=20.04.2.0-desktop-i386.list
+metalink=20.04.3-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -272,7 +272,7 @@ name=Wubi MD5
 packages=
 initrd=casper/initrd.lz
 md5sums=MD5SUMS
-metalink=20.04.2.0-desktop-amd64.list
+metalink=20.04.3-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -284,7 +284,7 @@ arch=i386
 name=Wubi gz
 packages=
 initrd=casper/initrd.gz
-metalink=20.04.2.0-desktop-i386.list
+metalink=20.04.3-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -296,7 +296,7 @@ arch=amd64
 name=Wubi gz
 packages=
 initrd=casper/initrd.gz
-metalink=20.04.2.0-desktop-amd64.list
+metalink=20.04.3-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -309,7 +309,7 @@ name=Wubi SHA256
 packages=
 initrd=casper/initrd.lz
 md5sums=SHA256SUMS
-metalink=20.04.2.0-desktop-i386.list
+metalink=20.04.3-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -322,7 +322,7 @@ name=Wubi SHA256
 packages=
 initrd=casper/initrd.lz
 md5sums=SHA256SUMS
-metalink=20.04.2.0-desktop-amd64.list
+metalink=20.04.3-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 
 website=https://github.com/hakuna-m/wubiuefi

diff --git a/debian/changelog b/debian/changelog
@@ -1,14 +1,16 @@
-wubi (20.04.2.0r342) focal; urgency=low
+wubi (20.04.3r343) focal; urgency=low
 
   [Hakuna Matata]
 
-  * isolist.ini for 20.04.2.0 
+  * Merge from master
+  * isolist.ini for 20.04.3
 
-wubi (20.04.1r342) focal; urgency=low
+wubi (20.04r343) focal; urgency=low
 
   [Hakuna Matata]
 
-  * Merge from master
+  * new pattern for .disk/info
+    https://github.com/hakuna-m/wubiuefi/issues/282    
 
 wubi (20.04r342) focal; urgency=low
 

diff --git a/src/wubi/backends/common/distro.py b/src/wubi/backends/common/distro.py
@@ -24,7 +24,7 @@
 import re
 
 log = logging.getLogger('Distro')
-disk_info_re = '''(?P<name>[\w\s-]+) (?P<version>[\w.]+)(?: LTS)?(?: (?:\")?(?P<codename>[\w\s-]+)(?:\")?)? - (?P<subversion>[\D]+)? (?P<arch>i386|amd64)(?:[\D]+)?(?P<build>[\d:.-]+)?'''
+disk_info_re = '''(?P<name>[\w\s-]+) (?P<version>[\w.]+)(?: LTS)?(?: (?:[\"\(])?(?P<codename>[\w\s-]+)(?:[\"\)])?)? - (?P<subversion>[\D]+)? (?P<arch>i386|amd64)(?:[\D]+)?(?P<build>[\d:.-]+)?'''
 disk_info_re = re.compile(disk_info_re)
 
 class Distro(object):