The volume-id expression should be able to match things like: 6.0.0,
6.0.1a, 6.0.10.
[ffidenci@cat libosinfo]$ python
Python 2.7.11 (default, Feb 5 2016, 01:53:41)
[GCC 6.0.0 20160201 (Red Hat 6.0.0-0.9)] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import re
>>> re.match(r'6.\d.\d\d?\d?', '6.0.0')
<_sre.SRE_Match object at 0x7f50d7de2578>
>>> re.match(r'6.\d.\d\d?\d?', '6.0.1')
<_sre.SRE_Match object at 0x7f50d7de25e0>
>>> re.match(r'6.\d.\d\d?\d?', '6.0.1a')
<_sre.SRE_Match object at 0x7f50d7de2578>
>>> re.match(r'6.\d.\d\d?\d?', '6.0.10')
<_sre.SRE_Match object at 0x7f50d7de25e0>
Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
---
data/os/debian.org/debian-6.xml.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/os/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in
index fbb6306..589c97a 100644
--- a/data/os/debian.org/debian-6.xml.in
+++ b/data/os/debian.org/debian-6.xml.in
@@ -31,7 +31,7 @@
<media arch="i686">
<url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.10/i386/iso-dvd/debian-6.0.10-i386-DVD-1.iso</url>
<iso>
- <volume-id>Debian 6.0.1?\d i386 1</volume-id>
+ <volume-id>Debian 6.\d.\d\d?\d? i386 1</volume-id>
</iso>
<kernel>install.386/vmlinuz</kernel>
<initrd>install.386/initrd.gz</initrd>
@@ -39,7 +39,7 @@
<media arch="x86_64">
<url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.10/amd64/iso-dvd/debian-6.0.10-amd64-DVD-1.iso</url>
<iso>
- <volume-id>Debian 6.0.1?\d amd64 1</volume-id>
+ <volume-id>Debian 6.\d.\d\d?\d? amd64 1</volume-id>
</iso>
<kernel>install.amd/vmlinuz</kernel>
<initrd>install.amd/initrd.gz</initrd>
--
2.7.4
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
