The current regex for Debian only expects a single digit as the micro version number, but Debian 6 goes up to 10. --- data/os/debian.org/debian-6.xml.in | 4 ++-- .../debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt diff --git a/data/os/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in index 0ca1e72..287f451 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.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url> <iso> - <volume-id>Debian 6.0.\d i386 1</volume-id> + <volume-id>Debian 6.0.1?\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.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url> <iso> - <volume-id>Debian 6.0.\d amd64 1</volume-id> + <volume-id>Debian 6.0.1?\d amd64 1</volume-id> </iso> <kernel>install.amd/vmlinuz</kernel> <initrd>install.amd/initrd.gz</initrd> diff --git a/test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt b/test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt new file mode 100644 index 0000000..dabb2b8 --- /dev/null +++ b/test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt @@ -0,0 +1,17 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 6.0.10 i386 1 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6 +Application id: +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 2292948 +El Torito VD version 1 found, boot catalog is in sector 9702 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found -- 2.5.0 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo