From fidencio at redhat.com Fri Mar 1 08:19:52 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 1 Mar 2019 09:19:52 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/2] fallback
In-Reply-To:
References:
Message-ID:
On Fri, Mar 1, 2019 at 12:48 AM Cole Robinson wrote:
>
> elements in the OS DB serve two broad purposes:
>
> 1) track public URLs, so apps can easily look up an install URL and
> associated metadata like relative initrd/kernel paths
> 2) track matching data, so users can use guess_os_by_tree
> with their own URL, and get an OS object back
>
> Every needs an explicit @arch value associated. This makes
> thoroughly covering case #2 difficult, because it requires enumerating
> ever supported OS arch in a block. This is useful to do for
> OS that have public URLs, because we want to enumerate those anyways.
> But for distros without public URLs (RHEL), getting coverage for #2
> requires adding a bunch of stubs for each supported @arch for
> not much gain.
>
> Additionally consider Fedora, which has primary architectures
> (aarch64, armv7hl, x86_64) and secondary architectures like ppc64le.
> The latter aren't necessarily considered official releases, so it's
> debatable whether to enumerate their install URLs in the fedora OS
> entries. However it's still useful to detect the URL as 'fedora',
> so virt-install attempts with a manually passed URL get proper defaults
> etc.
>
> This series makes it easier to add a catchall entry that is
> arch independent by specifying arch="unknown", and demonstrates using
> it to get treeinfo detection coverage for rhel5.
>
> One point: I don't think this arch=unknown will cause problems for API
> users. For case #1, users won't be interacting with this
> because it doesn't have any URL listed. For case #2, the user will
> already have to call osinfo_tree_create_from_location which will
> give a tree with relevant arch/kernel/initrd data parsed out of
> the treeinfo, and they should use that OsinfoTree object and not the
> OsinfoTree returned by guess_os_by_tree
There's a small catch though. We have to adapt the
osinfo_db_guess_os_from_tree() code to deal with the arch=unknown as
what it currently does is:
```
801 if (match_regex(os_family, tree_family) &&
802 match_regex(os_variant, tree_variant) &&
803 match_regex(os_version, tree_version) &&
804 match_regex(os_arch, tree_arch)) {
805 ret = os;
806 if (matched_tree != NULL)
807 *matched_tree = os_tree;
808 break;
809 }
```
A second comment ... *upstream* does not have the URLs, indeed and
this solution fits well there.
Downstream (not only RHEL) any other distro may have entries for each
one of their trees distributed as an additional package. For instance,
let's say we internally create something like: osinfo-db-rhel which
would have to contain all the trees with URLs ... we'd have to take
into consideration the "unknown" and avoid matching it against the
"known" ones. So, more logic to be adjusted in the
osinfo_db_guess_os_from_tree().
Considering everything said about the trees ... we still do face the
very same issues with the ISOs and we need to also decide what to do
with those.
I guess the main question here is how we can have a generic info that
can match every release of an OS ... but also have specialised entries
that *should* be taken into consideration even if they match an
"unknown" entry (before matching the right one).
Let's keep the discussion (and I'll re-post the tree series for RHEL-6
and RHEL-7 based on what we decide here).
>
> Cole Robinson (2):
> schema: Allow arch=unknown
> rhel5: add tree information
>
> data/os/redhat.com/rhel-5.10.xml.in | 7 +++++++
> data/os/redhat.com/rhel-5.11.xml.in | 7 +++++++
> data/os/redhat.com/rhel-5.4.xml.in | 7 +++++++
> data/os/redhat.com/rhel-5.5.xml.in | 7 +++++++
> data/os/redhat.com/rhel-5.6.xml.in | 7 +++++++
> data/os/redhat.com/rhel-5.7.xml.in | 7 +++++++
> data/os/redhat.com/rhel-5.8.xml.in | 7 +++++++
> data/os/redhat.com/rhel-5.9.xml.in | 7 +++++++
> data/schema/osinfo.rng.in | 1 +
> 9 files changed, 57 insertions(+)
>
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
From fidencio at redhat.com Fri Mar 1 09:37:42 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 1 Mar 2019 10:37:42 +0100
Subject: [Libosinfo] [libosinfo PATCH] syms: Add "global" to 1.4.0 symbols
Message-ID: <20190301093742.20942-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
osinfo/libosinfo.syms | 1 +
1 file changed, 1 insertion(+)
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index dad0c3b..5c200e3 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -563,6 +563,7 @@ LIBOSINFO_1.3.0 {
} LIBOSINFO_0.2.13;
LIBOSINFO_1.4.0 {
+ global:
osinfo_media_add_install_script;
osinfo_media_get_install_script_list;
} LIBOSINFO_1.3.0;
--
2.20.1
From berrange at redhat.com Fri Mar 1 10:19:53 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 1 Mar 2019 10:19:53 +0000
Subject: [Libosinfo] [libosinfo PATCH] syms: Add "global" to 1.4.0
symbols
In-Reply-To: <20190301093742.20942-1-fidencio@redhat.com>
References: <20190301093742.20942-1-fidencio@redhat.com>
Message-ID: <20190301101953.GC21251@redhat.com>
On Fri, Mar 01, 2019 at 10:37:42AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/libosinfo.syms | 1 +
> 1 file changed, 1 insertion(+)
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From berrange at redhat.com Fri Mar 1 10:21:29 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 1 Mar 2019 10:21:29 +0000
Subject: [Libosinfo] [libosinfo PATCH] tests: Add identify_media() tests
In-Reply-To: <20190228233001.19338-1-fidencio@redhat.com>
References: <20190228233001.19338-1-fidencio@redhat.com>
Message-ID: <20190301102129.GD21251@redhat.com>
On Fri, Mar 01, 2019 at 12:30:01AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> .../dbdata/os/libosinfo.org/test-db-media.xml | 32 ++++++++++
> tests/test-db.c | 58 +++++++++++++++++++
> 2 files changed, 90 insertions(+)
> create mode 100644 tests/dbdata/os/libosinfo.org/test-db-media.xml
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From fidencio at redhat.com Fri Mar 1 13:38:34 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 1 Mar 2019 14:38:34 +0100
Subject: [Libosinfo] [osinfo-db PATCH] ubuntu16.04: Update URLs to 16.04.6
medias
Message-ID: <20190301133834.9656-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
Pushed as test-mediauris fix
---
data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
index fbccc35..4523552 100644
--- a/data/os/ubuntu.com/ubuntu-16.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -31,7 +31,7 @@
- http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-i386.iso
+ http://releases.ubuntu.com/16.04/ubuntu-16.04.6-server-i386.iso
Ubuntu-Server 16.04(.\d\+?)? LTS i386
@@ -43,7 +43,7 @@
- http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso
+ http://releases.ubuntu.com/16.04/ubuntu-16.04.6-server-amd64.iso
Ubuntu-Server 16.04(.\d\+?)? LTS amd64
@@ -55,7 +55,7 @@
- http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-i386.iso
+ http://releases.ubuntu.com/16.04/ubuntu-16.04.6-desktop-i386.iso
Ubuntu 16.04(.\d\+?)? LTS i386
@@ -66,7 +66,7 @@
- http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso
+ http://releases.ubuntu.com/16.04/ubuntu-16.04.6-desktop-amd64.iso
Ubuntu 16.04(.\d\+?)? LTS amd64
@@ -77,13 +77,13 @@
- http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso
+ http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.6-server-powerpc.iso
Ubuntu-Server 16.04(.\d\+?)? LTS ppc
- http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-ppc64el.iso
+ http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.6-server-ppc64el.iso
Ubuntu-Server 16.04(.\d\+?)? LTS ppc64
@@ -91,7 +91,7 @@
install/initrd.gz
- http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-s390x.iso
+ http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.6-server-s390x.iso
Ubuntu-Server 16.04(.\d\+?)? LTS s390x
--
2.20.1
From fidencio at redhat.com Fri Mar 1 16:44:05 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 1 Mar 2019 17:44:05 +0100
Subject: [Libosinfo] ANNOUNCE: libosinfo 1.4.0 release
Message-ID:
I am happy to announce a new release of libosinfo, version 1.4.0:
https://releases.pagure.org/libosinfo/libosinfo-1.4.0.tar.gz
This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC
177B (4096R)
https://releases.pagure.org/libosinfo/libosinfo-1.4.0.tar.gz.asc
All historical releases are available from:
http://libosinfo.org/download/
Changes in this release include:
- Add isodata test files for more distros
- Refreshed translations from Zanata
- Drop deprecated gnome-common and intltool
- Fix test cases checking for medias, trees and images URIs due to
libcurl issues when reusing the curl handler
- Fix media identification when its identifiers have the maximum
allowed size
- Fix filling up the media properties when identifying it
- Improvements in the tests in order to reduce code duplication
- Add one test case per OS for medias, trees and images URIs tests
- Add OSINFO_RELEASE_STATUS_ROLLING release status
- Add API to add an installer script to a media
- Add API to get all the installer scripts from a media
Thanks to everyone who contributed to this release
Best Regards,
Fabiano Fid?ncio
From fidencio at redhat.com Fri Mar 1 16:44:08 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 1 Mar 2019 17:44:08 +0100
Subject: [Libosinfo] ANNOUNCE: osinfo-db-tools 1.4.0 release
Message-ID:
I am happy to announce a new release of osinfo-db-tools, version 1.4.0:
https://releases.pagure.org/libosinfo/osinfo-db-tools-1.4.0.tar.gz
This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC
177B (4096R)
https://releases.pagure.org/libosinfo/osinfo-db-tools-1.4.0.tar.gz.asc
All historical releases are available from:
http://libosinfo.org/download/
Changes in this release include:
- Refreshed translations from Zanata
- Drop deprecated gnome-common and intltool
Thanks to everyone who contributed to this release
Best Regards,
Fabiano Fid?ncio
From crobinso at redhat.com Fri Mar 1 17:13:00 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 12:13:00 -0500
Subject: [Libosinfo] [PATCH osinfo-db 0/2] fallback
In-Reply-To:
References:
Message-ID: <89992c5f-3a7a-54c9-2fbb-694156c3102b@redhat.com>
On 3/1/19 3:19 AM, Fabiano Fid?ncio wrote:
> On Fri, Mar 1, 2019 at 12:48 AM Cole Robinson wrote:
>>
>> elements in the OS DB serve two broad purposes:
>>
>> 1) track public URLs, so apps can easily look up an install URL and
>> associated metadata like relative initrd/kernel paths
>> 2) track matching data, so users can use guess_os_by_tree
>> with their own URL, and get an OS object back
>>
>> Every needs an explicit @arch value associated. This makes
>> thoroughly covering case #2 difficult, because it requires enumerating
>> ever supported OS arch in a block. This is useful to do for
>> OS that have public URLs, because we want to enumerate those anyways.
>> But for distros without public URLs (RHEL), getting coverage for #2
>> requires adding a bunch of stubs for each supported @arch for
>> not much gain.
>>
>> Additionally consider Fedora, which has primary architectures
>> (aarch64, armv7hl, x86_64) and secondary architectures like ppc64le.
>> The latter aren't necessarily considered official releases, so it's
>> debatable whether to enumerate their install URLs in the fedora OS
>> entries. However it's still useful to detect the URL as 'fedora',
>> so virt-install attempts with a manually passed URL get proper defaults
>> etc.
>>
>> This series makes it easier to add a catchall entry that is
>> arch independent by specifying arch="unknown", and demonstrates using
>> it to get treeinfo detection coverage for rhel5.
>>
>> One point: I don't think this arch=unknown will cause problems for API
>> users. For case #1, users won't be interacting with this
>> because it doesn't have any URL listed. For case #2, the user will
>> already have to call osinfo_tree_create_from_location which will
>> give a tree with relevant arch/kernel/initrd data parsed out of
>> the treeinfo, and they should use that OsinfoTree object and not the
>> OsinfoTree returned by guess_os_by_tree
>
> There's a small catch though. We have to adapt the
> osinfo_db_guess_os_from_tree() code to deal with the arch=unknown as
> what it currently does is:
> ```
> 801 if (match_regex(os_family, tree_family) &&
> 802 match_regex(os_variant, tree_variant) &&
> 803 match_regex(os_version, tree_version) &&
> 804 match_regex(os_arch, tree_arch)) {
> 805 ret = os;
> 806 if (matched_tree != NULL)
> 807 *matched_tree = os_tree;
> 808 break;
> 809 }
> ```
>
That's comparing two ./tree/treeinfo/arch values, not ./tree/@arch.
Since in my RHEL5 examples there's no ./tree/treeinfo/arch, the
comparison is effectively arch independent. It behaves similar to when
is missing for example
> A second comment ... *upstream* does not have the URLs, indeed and
> this solution fits well there.
> Downstream (not only RHEL) any other distro may have entries for each
> one of their trees distributed as an additional package. For instance,
> let's say we internally create something like: osinfo-db-rhel which
> would have to contain all the trees with URLs ... we'd have to take
> into consideration the "unknown" and avoid matching it against the
> "known" ones. So, more logic to be adjusted in the
> osinfo_db_guess_os_from_tree().
>
Good point. Maybe some XML annotation that explicitly marks the
or as a fallback or catchall, and we check against that last. Or
just have arch="unknown" imply that.
> Considering everything said about the trees ... we still do face the
> very same issues with the ISOs and we need to also decide what to do
> with those.
>
Indeed. fallback matching is a little worse off than ,
because media_create_from_location won't detect media arch, it depends
on guess_os_from_media to fill that value in with the returned
OsinfoMedia object. But with this style of fallback matching there won't
be any non-unknown returned arch value. Probably a minor issue in
practice but I wanted to point it out.
- Cole
> I guess the main question here is how we can have a generic info that
> can match every release of an OS ... but also have specialised entries
> that *should* be taken into consideration even if they match an
> "unknown" entry (before matching the right one).
>
> Let's keep the discussion (and I'll re-post the tree series for RHEL-6
> and RHEL-7 based on what we decide here).
From crobinso at redhat.com Fri Mar 1 20:54:13 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 15:54:13 -0500
Subject: [Libosinfo] [PATCH osinfo-db 0/4] treeinfo data fixes
Message-ID:
I wrote a script which iterates over the database and pulls out any
URLs that have associated metadata, then passes those
URLs to osinfo_tree_create_from_location + osinfo_guess_os_from_tree,
to ensure that we detect the URL as the same OS that it's listed with.
I'll attach the script in a follow up mail.
This series fixes the issues the script discovered.
Cole Robinson (4):
fedora: anchor ambiguous treeinfo versions
fedora21: Add treeinfo variant annotations
fedora29: Add treeinfo variant annotations
centos7: Fix treeinfo version
data/os/centos.org/centos-7.0.xml.in | 2 +-
data/os/fedoraproject.org/fedora-21.xml.in | 4 ++--
data/os/fedoraproject.org/fedora-29.xml.in | 2 ++
data/os/fedoraproject.org/fedora-7.xml.in | 4 ++--
data/os/fedoraproject.org/fedora-8.xml.in | 4 ++--
data/os/fedoraproject.org/fedora-9.xml.in | 4 ++--
6 files changed, 11 insertions(+), 9 deletions(-)
--
2.20.1
From crobinso at redhat.com Fri Mar 1 20:54:14 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 15:54:14 -0500
Subject: [Libosinfo] [PATCH osinfo-db 1/4] fedora: anchor ambiguous treeinfo
versions
In-Reply-To:
References:
Message-ID: <780acaf4f31b9473b224f26da743b3c8fb54fce9.1551473405.git.crobinso@redhat.com>
fedora 7/8/9 treeinfo versions regex needs to be anchored, otherwise
it can match version '29' for example, which it currently does and
breaks silverblue29 URL detection
Signed-off-by: Cole Robinson
---
data/os/fedoraproject.org/fedora-7.xml.in | 4 ++--
data/os/fedoraproject.org/fedora-8.xml.in | 4 ++--
data/os/fedoraproject.org/fedora-9.xml.in | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/os/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
index 03b15ba..8d19955 100644
--- a/data/os/fedoraproject.org/fedora-7.xml.in
+++ b/data/os/fedoraproject.org/fedora-7.xml.in
@@ -98,7 +98,7 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/
Fedora
- 7
+ ^7$
i386
@@ -106,7 +106,7 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/
Fedora
- 7
+ ^7$
x86_64
diff --git a/data/os/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
index 8aae791..77fa573 100644
--- a/data/os/fedoraproject.org/fedora-8.xml.in
+++ b/data/os/fedoraproject.org/fedora-8.xml.in
@@ -110,7 +110,7 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/
Fedora
- 8
+ ^8$
i386
@@ -118,7 +118,7 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/
Fedora
- 8
+ ^8$
x86_64
diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
index fff246d..0c40181 100644
--- a/data/os/fedoraproject.org/fedora-9.xml.in
+++ b/data/os/fedoraproject.org/fedora-9.xml.in
@@ -351,7 +351,7 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/
Fedora
- 9
+ ^9$
i386
@@ -359,7 +359,7 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/
Fedora
- 9
+ ^9$
x86_64
--
2.20.1
From crobinso at redhat.com Fri Mar 1 20:54:15 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 15:54:15 -0500
Subject: [Libosinfo] [PATCH osinfo-db 2/4] fedora21: Add treeinfo variant
annotations
In-Reply-To:
References:
Message-ID: <930f76381d324b75e373c0e162d751aa5217d8c8.1551473405.git.crobinso@redhat.com>
Without variants listed, the workstation and cloud treeinfo matching
is identical, which can cause URL detection mismatches
Signed-off-by: Cole Robinson
---
data/os/fedoraproject.org/fedora-21.xml.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/os/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
index f80a676..69d5763 100644
--- a/data/os/fedoraproject.org/fedora-21.xml.in
+++ b/data/os/fedoraproject.org/fedora-21.xml.in
@@ -164,7 +164,7 @@
https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/i386/os/
- Fedora
+ Fedora-Cloud
21
i386
@@ -173,7 +173,7 @@
https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/x86_64/os/
- Fedora
+ Fedora-Cloud
21
x86_64
--
2.20.1
From crobinso at redhat.com Fri Mar 1 20:54:16 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 15:54:16 -0500
Subject: [Libosinfo] [PATCH osinfo-db 3/4] fedora29: Add treeinfo variant
annotations
In-Reply-To:
References:
Message-ID: <433cfe27198b07dd0641b0a7262b6b14738a82e3.1551473405.git.crobinso@redhat.com>
Without variants listed, the server and workstation treeinfo matching
is identical, which can cause URL detection mismatches
Signed-off-by: Cole Robinson
---
data/os/fedoraproject.org/fedora-29.xml.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/os/fedoraproject.org/fedora-29.xml.in b/data/os/fedoraproject.org/fedora-29.xml.in
index fa209b9..60bb596 100644
--- a/data/os/fedoraproject.org/fedora-29.xml.in
+++ b/data/os/fedoraproject.org/fedora-29.xml.in
@@ -115,6 +115,7 @@
Fedora
29
x86_64
+ Workstation
@@ -125,6 +126,7 @@
Fedora
29
x86_64
+ Server
--
2.20.1
From crobinso at redhat.com Fri Mar 1 20:54:17 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 15:54:17 -0500
Subject: [Libosinfo] [PATCH osinfo-db 4/4] centos7: Fix treeinfo version
In-Reply-To:
References:
Message-ID:
The version field in all centos7 treeinfos I could find is 7, not 7.0
Signed-off-by: Cole Robinson
---
data/os/centos.org/centos-7.0.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index 7532fca..8b874ee 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -56,7 +56,7 @@
http://mirror.centos.org/centos-7/7/os/x86_64/
CentOS
- 7.0
+ 7
x86_64
--
2.20.1
From crobinso at redhat.com Fri Mar 1 20:57:52 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 15:57:52 -0500
Subject: [Libosinfo] [PATCH osinfo-db 0/4] treeinfo data fixes
In-Reply-To:
References:
Message-ID:
On 3/1/19 3:54 PM, Cole Robinson wrote:
> I wrote a script which iterates over the database and pulls out any
> URLs that have associated metadata, then passes those
> URLs to osinfo_tree_create_from_location + osinfo_guess_os_from_tree,
> to ensure that we detect the URL as the same OS that it's listed with.
> I'll attach the script in a follow up mail.
>
Script attached. This could be a starting point for a testcase I guess.
I think we would also want a test suite with raw treeinfo files though
which would be easier to unit test, in playing with this stuff it's
clear that it's easy to add a new treeinfo annotation which breaks
detection for an old URL
- Cole
-------------- next part --------------
A non-text attachment was scrubbed...
Name: osinfo-check-urls.py
Type: text/x-python
Size: 3507 bytes
Desc: not available
URL:
From crobinso at redhat.com Fri Mar 1 23:41:36 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:41:36 -0500
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
Message-ID:
This series adds:
* centos5 entries
* centos6 data
* scientificlinux 5.X
* scientificlinux 6.X
* scientificlinux 7.X
No iso data is added, just URLs. I'm trying to get osinfo-db to have
all the treeinfo coverage that virt-install has.
Cole Robinson (6):
centos6: Add data
centos: Add centos5 stubs
centos5: Add data
Add scientificlinux-5.X
Add scientificlinux-6.X
Add scientificlinux-7.X
data/os/centos.org/centos-5.0.xml.in | 27 +++++++++++
data/os/centos.org/centos-5.1.xml.in | 28 +++++++++++
data/os/centos.org/centos-5.10.xml.in | 34 ++++++++++++++
data/os/centos.org/centos-5.11.xml.in | 34 ++++++++++++++
data/os/centos.org/centos-5.2.xml.in | 28 +++++++++++
data/os/centos.org/centos-5.3.xml.in | 28 +++++++++++
data/os/centos.org/centos-5.4.xml.in | 32 +++++++++++++
data/os/centos.org/centos-5.5.xml.in | 34 ++++++++++++++
data/os/centos.org/centos-5.6.xml.in | 34 ++++++++++++++
data/os/centos.org/centos-5.7.xml.in | 34 ++++++++++++++
data/os/centos.org/centos-5.8.xml.in | 34 ++++++++++++++
data/os/centos.org/centos-5.9.xml.in | 34 ++++++++++++++
data/os/centos.org/centos-6.0.xml.in | 17 +++++++
data/os/centos.org/centos-6.1.xml.in | 17 +++++++
data/os/centos.org/centos-6.10.xml.in | 17 +++++++
data/os/centos.org/centos-6.2.xml.in | 17 +++++++
data/os/centos.org/centos-6.3.xml.in | 17 +++++++
data/os/centos.org/centos-6.4.xml.in | 17 +++++++
data/os/centos.org/centos-6.5.xml.in | 17 +++++++
data/os/centos.org/centos-6.6.xml.in | 17 +++++++
data/os/centos.org/centos-6.7.xml.in | 17 +++++++
data/os/centos.org/centos-6.8.xml.in | 17 +++++++
data/os/centos.org/centos-6.9.xml.in | 17 +++++++
.../scientificlinux-5.0.xml.in | 27 +++++++++++
.../scientificlinux-5.1.xml.in | 28 +++++++++++
.../scientificlinux-5.10.xml.in | 29 ++++++++++++
.../scientificlinux-5.11.xml.in | 34 ++++++++++++++
.../scientificlinux-5.2.xml.in | 34 ++++++++++++++
.../scientificlinux-5.3.xml.in | 34 ++++++++++++++
.../scientificlinux-5.4.xml.in | 34 ++++++++++++++
.../scientificlinux-5.5.xml.in | 34 ++++++++++++++
.../scientificlinux-5.6.xml.in | 34 ++++++++++++++
.../scientificlinux-5.7.xml.in | 34 ++++++++++++++
.../scientificlinux-5.8.xml.in | 34 ++++++++++++++
.../scientificlinux-5.9.xml.in | 29 ++++++++++++
.../scientificlinux-6.0.xml.in | 46 ++++++++++++++++++
.../scientificlinux-6.1.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.10.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.2.xml.in | 45 ++++++++++++++++++
.../scientificlinux-6.3.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.4.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.5.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.6.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.7.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.8.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.9.xml.in | 47 +++++++++++++++++++
.../scientificlinux-7-unknown.xml.in | 29 ++++++++++++
.../scientificlinux-7.0.xml.in | 40 ++++++++++++++++
.../scientificlinux-7.1.xml.in | 40 ++++++++++++++++
.../scientificlinux-7.2.xml.in | 40 ++++++++++++++++
.../scientificlinux-7.3.xml.in | 40 ++++++++++++++++
.../scientificlinux-7.4.xml.in | 40 ++++++++++++++++
.../scientificlinux-7.5.xml.in | 40 ++++++++++++++++
.../scientificlinux-7.6.xml.in | 40 ++++++++++++++++
54 files changed, 1760 insertions(+)
create mode 100644 data/os/centos.org/centos-5.0.xml.in
create mode 100644 data/os/centos.org/centos-5.1.xml.in
create mode 100644 data/os/centos.org/centos-5.10.xml.in
create mode 100644 data/os/centos.org/centos-5.11.xml.in
create mode 100644 data/os/centos.org/centos-5.2.xml.in
create mode 100644 data/os/centos.org/centos-5.3.xml.in
create mode 100644 data/os/centos.org/centos-5.4.xml.in
create mode 100644 data/os/centos.org/centos-5.5.xml.in
create mode 100644 data/os/centos.org/centos-5.6.xml.in
create mode 100644 data/os/centos.org/centos-5.7.xml.in
create mode 100644 data/os/centos.org/centos-5.8.xml.in
create mode 100644 data/os/centos.org/centos-5.9.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.0.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.1.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.10.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.11.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.2.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.3.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.4.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.5.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.6.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.7.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.8.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.9.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.0.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.1.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.10.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.2.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.3.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.4.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.5.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.6.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.7.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.8.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.9.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7-unknown.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.0.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.1.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.2.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.3.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.4.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.5.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.6.xml.in
--
2.20.1
From crobinso at redhat.com Fri Mar 1 23:41:37 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:41:37 -0500
Subject: [Libosinfo] [PATCH osinfo-db 1/6] centos6: Add data
In-Reply-To:
References:
Message-ID:
6.1 treeinfo version needs to be anchored, so as not to match 6.10
Signed-off-by: Cole Robinson
---
data/os/centos.org/centos-6.0.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.1.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.10.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.2.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.3.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.4.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.5.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.6.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.7.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.8.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-6.9.xml.in | 17 +++++++++++++++++
11 files changed, 187 insertions(+)
diff --git a/data/os/centos.org/centos-6.0.xml.in b/data/os/centos.org/centos-6.0.xml.in
index 77271a7..eb4e847 100644
--- a/data/os/centos.org/centos-6.0.xml.in
+++ b/data/os/centos.org/centos-6.0.xml.in
@@ -32,6 +32,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.0/os/x86_64/
+
+ CentOS
+ 6.0
+ x86_64
+
+
+
+ http://vault.centos.org/6.0/os/i386/
+
+ CentOS
+ 6.0
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.1.xml.in b/data/os/centos.org/centos-6.1.xml.in
index b8f0e4c..1036044 100644
--- a/data/os/centos.org/centos-6.1.xml.in
+++ b/data/os/centos.org/centos-6.1.xml.in
@@ -31,6 +31,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.1/os/x86_64/
+
+ CentOS
+ ^6.1$
+ x86_64
+
+
+
+ http://vault.centos.org/6.1/os/i386/
+
+ CentOS
+ ^6.1$
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.10.xml.in b/data/os/centos.org/centos-6.10.xml.in
index ceb04a2..bf98ba8 100644
--- a/data/os/centos.org/centos-6.10.xml.in
+++ b/data/os/centos.org/centos-6.10.xml.in
@@ -94,6 +94,23 @@
isolinux/initrd.img
+
+ http://mirror.centos.org/centos-6/6.10/os/x86_64/
+
+ CentOS
+ 6.10
+ x86_64
+
+
+
+ http://mirror.centos.org/centos-6/6.10/os/i386/
+
+ CentOS
+ 6.10
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.2.xml.in b/data/os/centos.org/centos-6.2.xml.in
index aeeeb5c..b4c1db9 100644
--- a/data/os/centos.org/centos-6.2.xml.in
+++ b/data/os/centos.org/centos-6.2.xml.in
@@ -31,6 +31,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.2/os/x86_64/
+
+ CentOS
+ 6.2
+ x86_64
+
+
+
+ http://vault.centos.org/6.2/os/i386/
+
+ CentOS
+ 6.2
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in
index f955ea8..371ade2 100644
--- a/data/os/centos.org/centos-6.3.xml.in
+++ b/data/os/centos.org/centos-6.3.xml.in
@@ -39,6 +39,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.3/os/x86_64/
+
+ CentOS
+ 6.3
+ x86_64
+
+
+
+ http://vault.centos.org/6.3/os/i386/
+
+ CentOS
+ 6.3
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.4.xml.in b/data/os/centos.org/centos-6.4.xml.in
index 035cefe..2a0386e 100644
--- a/data/os/centos.org/centos-6.4.xml.in
+++ b/data/os/centos.org/centos-6.4.xml.in
@@ -31,6 +31,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.4/os/x86_64/
+
+ CentOS
+ 6.4
+ x86_64
+
+
+
+ http://vault.centos.org/6.4/os/i386/
+
+ CentOS
+ 6.4
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.5.xml.in b/data/os/centos.org/centos-6.5.xml.in
index 1c6ece7..f6a8897 100644
--- a/data/os/centos.org/centos-6.5.xml.in
+++ b/data/os/centos.org/centos-6.5.xml.in
@@ -31,6 +31,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.5/os/x86_64/
+
+ CentOS
+ 6.5
+ x86_64
+
+
+
+ http://vault.centos.org/6.5/os/i386/
+
+ CentOS
+ 6.5
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.6.xml.in b/data/os/centos.org/centos-6.6.xml.in
index e0a1c3d..9018b2a 100644
--- a/data/os/centos.org/centos-6.6.xml.in
+++ b/data/os/centos.org/centos-6.6.xml.in
@@ -74,6 +74,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.6/os/x86_64/
+
+ CentOS
+ 6.6
+ x86_64
+
+
+
+ http://vault.centos.org/6.6/os/i386/
+
+ CentOS
+ 6.6
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index 0b34276..2041e76 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -110,6 +110,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.7/os/x86_64/
+
+ CentOS
+ 6.7
+ x86_64
+
+
+
+ http://vault.centos.org/6.7/os/i386/
+
+ CentOS
+ 6.7
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.8.xml.in b/data/os/centos.org/centos-6.8.xml.in
index d9c8d59..0c84297 100644
--- a/data/os/centos.org/centos-6.8.xml.in
+++ b/data/os/centos.org/centos-6.8.xml.in
@@ -112,6 +112,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.8/os/x86_64/
+
+ CentOS
+ 6.8
+ x86_64
+
+
+
+ http://vault.centos.org/6.8/os/i386/
+
+ CentOS
+ 6.8
+ i386
+
+
+
1
diff --git a/data/os/centos.org/centos-6.9.xml.in b/data/os/centos.org/centos-6.9.xml.in
index 204e24d..93e03af 100644
--- a/data/os/centos.org/centos-6.9.xml.in
+++ b/data/os/centos.org/centos-6.9.xml.in
@@ -94,6 +94,23 @@
isolinux/initrd.img
+
+ http://vault.centos.org/6.9/os/x86_64/
+
+ CentOS
+ 6.9
+ x86_64
+
+
+
+ http://vault.centos.org/6.9/os/i386/
+
+ CentOS
+ 6.9
+ i386
+
+
+
1
--
2.20.1
From crobinso at redhat.com Fri Mar 1 23:41:38 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:41:38 -0500
Subject: [Libosinfo] [PATCH osinfo-db 2/6] centos: Add centos5 stubs
In-Reply-To:
References:
Message-ID: <69f8f6f3dd9e6c457ae909f035f1549f618319f1.1551483675.git.crobinso@redhat.com>
Release dates are taken from distrowatch.com
EOL date is the general centos5 EOL date reported here:
https://lists.centos.org/pipermail/centos-announce/2017-April/022350.html
Signed-off-by: Cole Robinson
---
data/os/centos.org/centos-5.0.xml.in | 16 ++++++++++++++++
data/os/centos.org/centos-5.1.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.10.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.11.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.2.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.3.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.4.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.5.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.6.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.7.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.8.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.9.xml.in | 17 +++++++++++++++++
12 files changed, 203 insertions(+)
create mode 100644 data/os/centos.org/centos-5.0.xml.in
create mode 100644 data/os/centos.org/centos-5.1.xml.in
create mode 100644 data/os/centos.org/centos-5.10.xml.in
create mode 100644 data/os/centos.org/centos-5.11.xml.in
create mode 100644 data/os/centos.org/centos-5.2.xml.in
create mode 100644 data/os/centos.org/centos-5.3.xml.in
create mode 100644 data/os/centos.org/centos-5.4.xml.in
create mode 100644 data/os/centos.org/centos-5.5.xml.in
create mode 100644 data/os/centos.org/centos-5.6.xml.in
create mode 100644 data/os/centos.org/centos-5.7.xml.in
create mode 100644 data/os/centos.org/centos-5.8.xml.in
create mode 100644 data/os/centos.org/centos-5.9.xml.in
diff --git a/data/os/centos.org/centos-5.0.xml.in b/data/os/centos.org/centos-5.0.xml.in
new file mode 100644
index 0000000..3d7c9a2
--- /dev/null
+++ b/data/os/centos.org/centos-5.0.xml.in
@@ -0,0 +1,16 @@
+
+
+
+ centos5.0
+ <_name>CentOS 5.0
+ 5.0
+ <_vendor>CentOS
+ linux
+ centos
+
+
+ 2007-04-12
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.1.xml.in b/data/os/centos.org/centos-5.1.xml.in
new file mode 100644
index 0000000..eed72bb
--- /dev/null
+++ b/data/os/centos.org/centos-5.1.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.1
+ <_name>CentOS 5.1
+ 5.1
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2007-12-02
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.10.xml.in b/data/os/centos.org/centos-5.10.xml.in
new file mode 100644
index 0000000..8ab6bd4
--- /dev/null
+++ b/data/os/centos.org/centos-5.10.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.10
+ <_name>CentOS 5.10
+ 5.10
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2013-10-19
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.11.xml.in b/data/os/centos.org/centos-5.11.xml.in
new file mode 100644
index 0000000..16fd673
--- /dev/null
+++ b/data/os/centos.org/centos-5.11.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.11
+ <_name>CentOS 5.11
+ 5.11
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2014-09-30
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.2.xml.in b/data/os/centos.org/centos-5.2.xml.in
new file mode 100644
index 0000000..efdf281
--- /dev/null
+++ b/data/os/centos.org/centos-5.2.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.2
+ <_name>CentOS 5.2
+ 5.2
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2008-06-24
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.3.xml.in b/data/os/centos.org/centos-5.3.xml.in
new file mode 100644
index 0000000..9fc4d6b
--- /dev/null
+++ b/data/os/centos.org/centos-5.3.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.3
+ <_name>CentOS 5.3
+ 5.3
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2009-04-01
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.4.xml.in b/data/os/centos.org/centos-5.4.xml.in
new file mode 100644
index 0000000..d3e1769
--- /dev/null
+++ b/data/os/centos.org/centos-5.4.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.4
+ <_name>CentOS 5.4
+ 5.4
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2009-10-21
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.5.xml.in b/data/os/centos.org/centos-5.5.xml.in
new file mode 100644
index 0000000..2d5029b
--- /dev/null
+++ b/data/os/centos.org/centos-5.5.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.5
+ <_name>CentOS 5.5
+ 5.5
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2010-05-15
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.6.xml.in b/data/os/centos.org/centos-5.6.xml.in
new file mode 100644
index 0000000..5b14756
--- /dev/null
+++ b/data/os/centos.org/centos-5.6.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.6
+ <_name>CentOS 5.6
+ 5.6
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2011-04-09
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.7.xml.in b/data/os/centos.org/centos-5.7.xml.in
new file mode 100644
index 0000000..dac2080
--- /dev/null
+++ b/data/os/centos.org/centos-5.7.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.7
+ <_name>CentOS 5.7
+ 5.7
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2011-09-14
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.8.xml.in b/data/os/centos.org/centos-5.8.xml.in
new file mode 100644
index 0000000..4517043
--- /dev/null
+++ b/data/os/centos.org/centos-5.8.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.8
+ <_name>CentOS 5.8
+ 5.8
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2012-03-08
+ 2017-03-31
+
+
diff --git a/data/os/centos.org/centos-5.9.xml.in b/data/os/centos.org/centos-5.9.xml.in
new file mode 100644
index 0000000..e087b25
--- /dev/null
+++ b/data/os/centos.org/centos-5.9.xml.in
@@ -0,0 +1,17 @@
+
+
+
+ centos5.9
+ <_name>CentOS 5.9
+ 5.9
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2013-01-17
+ 2017-03-31
+
+
--
2.20.1
From crobinso at redhat.com Fri Mar 1 23:41:39 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:41:39 -0500
Subject: [Libosinfo] [PATCH osinfo-db 3/6] centos5: Add data
In-Reply-To:
References:
Message-ID: <6b26aee89b753d5b558dbb028408f3c7e4b77163.1551483675.git.crobinso@redhat.com>
Prior to centos5.4, there was no treeinfo, so just list explicit
URLs + initrd + vmlinuz. For 5.4, only i386 has listed treeinfo
strangely...
Signed-off-by: Cole Robinson
---
data/os/centos.org/centos-5.0.xml.in | 11 +++++++++++
data/os/centos.org/centos-5.1.xml.in | 11 +++++++++++
data/os/centos.org/centos-5.10.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.11.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.2.xml.in | 11 +++++++++++
data/os/centos.org/centos-5.3.xml.in | 11 +++++++++++
data/os/centos.org/centos-5.4.xml.in | 15 +++++++++++++++
data/os/centos.org/centos-5.5.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.6.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.7.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.8.xml.in | 17 +++++++++++++++++
data/os/centos.org/centos-5.9.xml.in | 17 +++++++++++++++++
12 files changed, 178 insertions(+)
diff --git a/data/os/centos.org/centos-5.0.xml.in b/data/os/centos.org/centos-5.0.xml.in
index 3d7c9a2..51cda22 100644
--- a/data/os/centos.org/centos-5.0.xml.in
+++ b/data/os/centos.org/centos-5.0.xml.in
@@ -12,5 +12,16 @@
2007-04-12
2017-03-31
+
+
+ http://vault.centos.org/5.0/os/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://vault.centos.org/5.0/os/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
diff --git a/data/os/centos.org/centos-5.1.xml.in b/data/os/centos.org/centos-5.1.xml.in
index eed72bb..6f32175 100644
--- a/data/os/centos.org/centos-5.1.xml.in
+++ b/data/os/centos.org/centos-5.1.xml.in
@@ -13,5 +13,16 @@
2007-12-02
2017-03-31
+
+
+ http://vault.centos.org/5.1/os/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://vault.centos.org/5.1/os/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
diff --git a/data/os/centos.org/centos-5.10.xml.in b/data/os/centos.org/centos-5.10.xml.in
index 8ab6bd4..4c345c1 100644
--- a/data/os/centos.org/centos-5.10.xml.in
+++ b/data/os/centos.org/centos-5.10.xml.in
@@ -13,5 +13,22 @@
2013-10-19
2017-03-31
+
+
+ http://vault.centos.org/5.10/os/x86_64/
+
+ CentOS
+ 5.10
+ x86_64
+
+
+
+ http://vault.centos.org/5.10/os/i386/
+
+ CentOS
+ 5.10
+ i386
+
+
diff --git a/data/os/centos.org/centos-5.11.xml.in b/data/os/centos.org/centos-5.11.xml.in
index 16fd673..4dec6ce 100644
--- a/data/os/centos.org/centos-5.11.xml.in
+++ b/data/os/centos.org/centos-5.11.xml.in
@@ -13,5 +13,22 @@
2014-09-30
2017-03-31
+
+
+ http://vault.centos.org/5.11/os/x86_64/
+
+ CentOS
+ 5.11
+ x86_64
+
+
+
+ http://vault.centos.org/5.11/os/i386/
+
+ CentOS
+ 5.11
+ i386
+
+
diff --git a/data/os/centos.org/centos-5.2.xml.in b/data/os/centos.org/centos-5.2.xml.in
index efdf281..a150a2c 100644
--- a/data/os/centos.org/centos-5.2.xml.in
+++ b/data/os/centos.org/centos-5.2.xml.in
@@ -13,5 +13,16 @@
2008-06-24
2017-03-31
+
+
+ http://vault.centos.org/5.2/os/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://vault.centos.org/5.2/os/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
diff --git a/data/os/centos.org/centos-5.3.xml.in b/data/os/centos.org/centos-5.3.xml.in
index 9fc4d6b..58155fa 100644
--- a/data/os/centos.org/centos-5.3.xml.in
+++ b/data/os/centos.org/centos-5.3.xml.in
@@ -13,5 +13,16 @@
2009-04-01
2017-03-31
+
+
+ http://vault.centos.org/5.3/os/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://vault.centos.org/5.3/os/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
diff --git a/data/os/centos.org/centos-5.4.xml.in b/data/os/centos.org/centos-5.4.xml.in
index d3e1769..5a9026d 100644
--- a/data/os/centos.org/centos-5.4.xml.in
+++ b/data/os/centos.org/centos-5.4.xml.in
@@ -13,5 +13,20 @@
2009-10-21
2017-03-31
+
+
+
+ http://vault.centos.org/5.4/os/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://vault.centos.org/5.4/os/i386/
+
+ CentOS
+ 5.4
+ i386
+
+
diff --git a/data/os/centos.org/centos-5.5.xml.in b/data/os/centos.org/centos-5.5.xml.in
index 2d5029b..637329d 100644
--- a/data/os/centos.org/centos-5.5.xml.in
+++ b/data/os/centos.org/centos-5.5.xml.in
@@ -13,5 +13,22 @@
2010-05-15
2017-03-31
+
+
+ http://vault.centos.org/5.5/os/x86_64/
+
+ CentOS
+ 5.5
+ x86_64
+
+
+
+ http://vault.centos.org/5.5/os/i386/
+
+ CentOS
+ 5.5
+ i386
+
+
diff --git a/data/os/centos.org/centos-5.6.xml.in b/data/os/centos.org/centos-5.6.xml.in
index 5b14756..d598cce 100644
--- a/data/os/centos.org/centos-5.6.xml.in
+++ b/data/os/centos.org/centos-5.6.xml.in
@@ -13,5 +13,22 @@
2011-04-09
2017-03-31
+
+
+ http://vault.centos.org/5.6/os/x86_64/
+
+ CentOS
+ 5.6
+ x86_64
+
+
+
+ http://vault.centos.org/5.6/os/i386/
+
+ CentOS
+ 5.6
+ i386
+
+
diff --git a/data/os/centos.org/centos-5.7.xml.in b/data/os/centos.org/centos-5.7.xml.in
index dac2080..091d1be 100644
--- a/data/os/centos.org/centos-5.7.xml.in
+++ b/data/os/centos.org/centos-5.7.xml.in
@@ -13,5 +13,22 @@
2011-09-14
2017-03-31
+
+
+ http://vault.centos.org/5.7/os/x86_64/
+
+ CentOS
+ 5.7
+ x86_64
+
+
+
+ http://vault.centos.org/5.7/os/i386/
+
+ CentOS
+ 5.7
+ i386
+
+
diff --git a/data/os/centos.org/centos-5.8.xml.in b/data/os/centos.org/centos-5.8.xml.in
index 4517043..9a1a38b 100644
--- a/data/os/centos.org/centos-5.8.xml.in
+++ b/data/os/centos.org/centos-5.8.xml.in
@@ -13,5 +13,22 @@
2012-03-08
2017-03-31
+
+
+ http://vault.centos.org/5.8/os/x86_64/
+
+ CentOS
+ 5.8
+ x86_64
+
+
+
+ http://vault.centos.org/5.8/os/i386/
+
+ CentOS
+ 5.8
+ i386
+
+
diff --git a/data/os/centos.org/centos-5.9.xml.in b/data/os/centos.org/centos-5.9.xml.in
index e087b25..8482581 100644
--- a/data/os/centos.org/centos-5.9.xml.in
+++ b/data/os/centos.org/centos-5.9.xml.in
@@ -13,5 +13,22 @@
2013-01-17
2017-03-31
+
+
+ http://vault.centos.org/5.9/os/x86_64/
+
+ CentOS
+ 5.9
+ x86_64
+
+
+
+ http://vault.centos.org/5.9/os/i386/
+
+ CentOS
+ 5.9
+ i386
+
+
--
2.20.1
From crobinso at redhat.com Fri Mar 1 23:41:40 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:41:40 -0500
Subject: [Libosinfo] [PATCH osinfo-db 4/6] Add scientificlinux-5.X
In-Reply-To:
References:
Message-ID: <49809efb7c7228dbb4c6ed5f05492fcbcd432340.1551483675.git.crobinso@redhat.com>
Scientific Linux is a RHEL clone, like CentOS. This adds the 5.X
series.
* Release dates are from here:
https://www.scientificlinux.org/downloads/sl-versions/sl5/
* EOL date is the CentOS 5 EOL date, since it seems SL ended the same
month
* treeinfo availability is spotty, this is documented in comments
Signed-off-by: Cole Robinson
---
.../scientificlinux-5.0.xml.in | 27 +++++++++++++++
.../scientificlinux-5.1.xml.in | 28 +++++++++++++++
.../scientificlinux-5.10.xml.in | 29 ++++++++++++++++
.../scientificlinux-5.11.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.2.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.3.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.4.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.5.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.6.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.7.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.8.xml.in | 34 +++++++++++++++++++
.../scientificlinux-5.9.xml.in | 29 ++++++++++++++++
12 files changed, 385 insertions(+)
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.0.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.1.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.10.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.11.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.2.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.3.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.4.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.5.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.6.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.7.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.8.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-5.9.xml.in
diff --git a/data/os/scientificlinux.org/scientificlinux-5.0.xml.in b/data/os/scientificlinux.org/scientificlinux-5.0.xml.in
new file mode 100644
index 0000000..6462156
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.0.xml.in
@@ -0,0 +1,27 @@
+
+
+
+ scientificlinux5.0
+ <_name>Scientific Linux 5.0
+ 5.0
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+ 2007-05-07
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/50/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/50/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.1.xml.in b/data/os/scientificlinux.org/scientificlinux-5.1.xml.in
new file mode 100644
index 0000000..73f19ec
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.1.xml.in
@@ -0,0 +1,28 @@
+
+
+
+ scientificlinux5.1
+ <_name>Scientific Linux 5.1
+ 5.1
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2008-01-15
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/51/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/51/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.10.xml.in b/data/os/scientificlinux.org/scientificlinux-5.10.xml.in
new file mode 100644
index 0000000..6adcf73
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.10.xml.in
@@ -0,0 +1,29 @@
+
+
+
+ scientificlinux5.10
+ <_name>Scientific Linux 5.10
+ 5.10
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2014-11-14
+ 2017-03-31
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/510/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/510/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.11.xml.in b/data/os/scientificlinux.org/scientificlinux-5.11.xml.in
new file mode 100644
index 0000000..dae4fe1
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.11.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.11
+ <_name>Scientific Linux 5.11
+ 5.11
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2013-11-11
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/511/x86_64/
+
+ Scientific Linux
+ 511
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/511/i386/
+
+ Scientific Linux
+ 511
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.2.xml.in b/data/os/scientificlinux.org/scientificlinux-5.2.xml.in
new file mode 100644
index 0000000..f08643d
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.2.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.2
+ <_name>Scientific Linux 5.2
+ 5.2
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2008-06-26
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/52/x86_64/
+
+ Scientific Linux
+ 52
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/52/i386/
+
+ Scientific Linux
+ 52
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.3.xml.in b/data/os/scientificlinux.org/scientificlinux-5.3.xml.in
new file mode 100644
index 0000000..b0cd27f
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.3.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.3
+ <_name>Scientific Linux 5.3
+ 5.3
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2009-03-19
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/53/x86_64/
+
+ Scientific Linux
+ 53
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/53/i386/
+
+ Scientific Linux
+ 53
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.4.xml.in b/data/os/scientificlinux.org/scientificlinux-5.4.xml.in
new file mode 100644
index 0000000..8c36c11
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.4.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.4
+ <_name>Scientific Linux 5.4
+ 5.4
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2009-11-04
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/54/x86_64/
+
+ Scientific Linux
+ 54
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/54/i386/
+
+ Scientific Linux
+ 54
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.5.xml.in b/data/os/scientificlinux.org/scientificlinux-5.5.xml.in
new file mode 100644
index 0000000..4ba185d
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.5.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.5
+ <_name>Scientific Linux 5.5
+ 5.5
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2010-05-19
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/55/x86_64/
+
+ Scientific Linux
+ 55
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/55/i386/
+
+ Scientific Linux
+ 55
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.6.xml.in b/data/os/scientificlinux.org/scientificlinux-5.6.xml.in
new file mode 100644
index 0000000..eb864a6
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.6.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.6
+ <_name>Scientific Linux 5.6
+ 5.6
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2011-06-21
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/56/x86_64/
+
+ Scientific Linux
+ 56
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/56/i386/
+
+ Scientific Linux
+ 56
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.7.xml.in b/data/os/scientificlinux.org/scientificlinux-5.7.xml.in
new file mode 100644
index 0000000..650db81
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.7.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.7
+ <_name>Scientific Linux 5.7
+ 5.7
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2011-09-14
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/57/x86_64/
+
+ Scientific Linux
+ 57
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/57/i386/
+
+ Scientific Linux
+ 57
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.8.xml.in b/data/os/scientificlinux.org/scientificlinux-5.8.xml.in
new file mode 100644
index 0000000..ce34689
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.8.xml.in
@@ -0,0 +1,34 @@
+
+
+
+ scientificlinux5.8
+ <_name>Scientific Linux 5.8
+ 5.8
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2012-04-24
+ 2017-03-31
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/58/x86_64/
+
+ Scientific Linux
+ 58
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/58/i386/
+
+ Scientific Linux
+ 58
+ i386
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-5.9.xml.in b/data/os/scientificlinux.org/scientificlinux-5.9.xml.in
new file mode 100644
index 0000000..5b58366
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-5.9.xml.in
@@ -0,0 +1,29 @@
+
+
+
+ scientificlinux5.9
+ <_name>Scientific Linux 5.9
+ 5.9
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2013-02-05
+ 2017-03-31
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/59/x86_64/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/obsolete/59/i386/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
--
2.20.1
From crobinso at redhat.com Fri Mar 1 23:41:41 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:41:41 -0500
Subject: [Libosinfo] [PATCH osinfo-db 5/6] Add scientificlinux-6.X
In-Reply-To:
References:
Message-ID: <7144deb3b8052a5bb6bc3fabec941336e52efe3b.1551483675.git.crobinso@redhat.com>
Scientific Linux is a RHEL clone, like CentOS. This adds the 6.X
series.
* Release dates are from here:
https://www.scientificlinux.org/downloads/sl-versions/sl6/
* EOL dates and are taken from centos metadata
* treeinfo is a mess here, lots of URLs have the wrong version.
Busted examples have comments in the XML
Signed-off-by: Cole Robinson
---
.../scientificlinux-6.0.xml.in | 46 ++++++++++++++++++
.../scientificlinux-6.1.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.10.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.2.xml.in | 45 ++++++++++++++++++
.../scientificlinux-6.3.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.4.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.5.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.6.xml.in | 43 +++++++++++++++++
.../scientificlinux-6.7.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.8.xml.in | 47 +++++++++++++++++++
.../scientificlinux-6.9.xml.in | 47 +++++++++++++++++++
11 files changed, 498 insertions(+)
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.0.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.1.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.10.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.2.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.3.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.4.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.5.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.6.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.7.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.8.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-6.9.xml.in
diff --git a/data/os/scientificlinux.org/scientificlinux-6.0.xml.in b/data/os/scientificlinux.org/scientificlinux-6.0.xml.in
new file mode 100644
index 0000000..bf2f589
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.0.xml.in
@@ -0,0 +1,46 @@
+
+
+
+ scientificlinux6.0
+ <_name>Scientific Linux 6.0
+ 6.0
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+ 2011-03-03
+ 2011-12-09
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.0/x86_64/os/
+
+ Scientific Linux
+ 6.0
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.0/i386/os/
+
+ Scientific Linux
+ 6.0
+ i386
+
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.1.xml.in b/data/os/scientificlinux.org/scientificlinux-6.1.xml.in
new file mode 100644
index 0000000..f9ad3a3
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.1.xml.in
@@ -0,0 +1,47 @@
+
+
+
+ scientificlinux6.1
+ <_name>Scientific Linux 6.1
+ 6.1
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2011-07-28
+ 2011-12-20
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.1/x86_64/os/
+
+ Scientific Linux
+ ^6.1$
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.1/i386/os/
+
+ Scientific Linux
+ ^6.1$
+ i386
+
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.10.xml.in b/data/os/scientificlinux.org/scientificlinux-6.10.xml.in
new file mode 100644
index 0000000..0c7f833
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.10.xml.in
@@ -0,0 +1,47 @@
+
+
+
+ scientificlinux6.10
+ <_name>Scientific Linux 6.10
+ 6.10
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2018-07-10
+ 2020-11-30
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.10/x86_64/os/
+
+ Scientific Linux
+ 6.10
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.10/i386/os/
+
+ Scientific Linux
+ 6.10
+ i386
+
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.2.xml.in b/data/os/scientificlinux.org/scientificlinux-6.2.xml.in
new file mode 100644
index 0000000..9919858
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.2.xml.in
@@ -0,0 +1,45 @@
+
+
+
+ scientificlinux6.2
+ <_name>Scientific Linux 6.2
+ 6.2
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2012-02-15
+ 2012-07-09
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.2/x86_64/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.2/i386/os/
+
+ Scientific Linux
+ 6.2
+ i386
+
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.3.xml.in b/data/os/scientificlinux.org/scientificlinux-6.3.xml.in
new file mode 100644
index 0000000..17dc90f
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.3.xml.in
@@ -0,0 +1,43 @@
+
+
+
+ scientificlinux6.3
+ <_name>Scientific Linux 6.3
+ 6.3
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2012-09-08
+ 2013-03-09
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.3/x86_64/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.3/i386/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.4.xml.in b/data/os/scientificlinux.org/scientificlinux-6.4.xml.in
new file mode 100644
index 0000000..62a6baa
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.4.xml.in
@@ -0,0 +1,43 @@
+
+
+
+ scientificlinux6.4
+ <_name>Scientific Linux 6.4
+ 6.4
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2013-03-28
+ 2013-12-01
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.4/x86_64/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.4/i386/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.5.xml.in b/data/os/scientificlinux.org/scientificlinux-6.5.xml.in
new file mode 100644
index 0000000..96a5522
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.5.xml.in
@@ -0,0 +1,43 @@
+
+
+
+ scientificlinux6.5
+ <_name>Scientific Linux 6.5
+ 6.5
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2014-01-31
+ 2014-10-28
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.5/x86_64/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.5/i386/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.6.xml.in b/data/os/scientificlinux.org/scientificlinux-6.6.xml.in
new file mode 100644
index 0000000..86743c5
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.6.xml.in
@@ -0,0 +1,43 @@
+
+
+
+ scientificlinux6.6
+ <_name>Scientific Linux 6.6
+ 6.6
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2014-11-12
+ 2015-08-07
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.6/x86_64/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.6/i386/os/
+ images/pxeboot/vmlinuz
+ images/pxeboot/initrd.img
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.7.xml.in b/data/os/scientificlinux.org/scientificlinux-6.7.xml.in
new file mode 100644
index 0000000..5247350
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.7.xml.in
@@ -0,0 +1,47 @@
+
+
+
+ scientificlinux6.7
+ <_name>Scientific Linux 6.7
+ 6.7
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2015-08-26
+ 2016-05-25
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.7/x86_64/os/
+
+ Scientific
+ 6.7
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.7/i386/os/
+
+ Scientific Linux
+ 6.7
+ i386
+
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.8.xml.in b/data/os/scientificlinux.org/scientificlinux-6.8.xml.in
new file mode 100644
index 0000000..c406921
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.8.xml.in
@@ -0,0 +1,47 @@
+
+
+
+ scientificlinux6.8
+ <_name>Scientific Linux 6.8
+ 6.8
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2016-07-15
+ 2017-04-05
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.8/x86_64/os/
+
+ Scientific Linux
+ 6.8
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.8/i386/os/
+
+ Scientific Linux
+ 6.8
+ i386
+
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-6.9.xml.in b/data/os/scientificlinux.org/scientificlinux-6.9.xml.in
new file mode 100644
index 0000000..ec37b12
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-6.9.xml.in
@@ -0,0 +1,47 @@
+
+
+
+ scientificlinux6.9
+ <_name>Scientific Linux 6.9
+ 6.9
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2017-04-17
+ 2018-07-03
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.9/x86_64/os/
+
+ Scientific Linux
+ 6.9
+ x86_64
+
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/6.9/i386/os/
+
+ Scientific Linux
+ 6.9
+ i386
+
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
--
2.20.1
From crobinso at redhat.com Fri Mar 1 23:41:42 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:41:42 -0500
Subject: [Libosinfo] [PATCH osinfo-db 6/6] Add scientificlinux-7.X
In-Reply-To:
References:
Message-ID: <4d46373bb9740cbe04ac8f085a2213429095dab3.1551483675.git.crobinso@redhat.com>
Scientific Linux is a RHEL clone, like CentOS. This adds the 7.X
series.
* Release dates are from here:
https://www.scientificlinux.org/downloads/sl-versions/sl7/
* are taken from rhel7 metadata
* Only x86_64 is available
Signed-off-by: Cole Robinson
---
.../scientificlinux-7-unknown.xml.in | 29 ++++++++++++++
.../scientificlinux-7.0.xml.in | 40 +++++++++++++++++++
.../scientificlinux-7.1.xml.in | 40 +++++++++++++++++++
.../scientificlinux-7.2.xml.in | 40 +++++++++++++++++++
.../scientificlinux-7.3.xml.in | 40 +++++++++++++++++++
.../scientificlinux-7.4.xml.in | 40 +++++++++++++++++++
.../scientificlinux-7.5.xml.in | 40 +++++++++++++++++++
.../scientificlinux-7.6.xml.in | 40 +++++++++++++++++++
8 files changed, 309 insertions(+)
create mode 100644 data/os/scientificlinux.org/scientificlinux-7-unknown.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.0.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.1.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.2.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.3.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.4.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.5.xml.in
create mode 100644 data/os/scientificlinux.org/scientificlinux-7.6.xml.in
diff --git a/data/os/scientificlinux.org/scientificlinux-7-unknown.xml.in b/data/os/scientificlinux.org/scientificlinux-7-unknown.xml.in
new file mode 100644
index 0000000..19a089a
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7-unknown.xml.in
@@ -0,0 +1,29 @@
+
+
+
+ scientificlinux7-unknown
+ <_name>Scientific Linux 7 Unknown
+ 7-unknown
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-7.0.xml.in b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
new file mode 100644
index 0000000..cc5544b
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
@@ -0,0 +1,40 @@
+
+
+
+ scientificlinux7.0
+ <_name>Scientific Linux 7.0
+ 7.0
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2014-10-13
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/7.0/x86_64/os/
+
+ Scientific
+ 7.0
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-7.1.xml.in b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
new file mode 100644
index 0000000..590d72e
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
@@ -0,0 +1,40 @@
+
+
+
+ scientificlinux7.1
+ <_name>Scientific Linux 7.1
+ 7.1
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2015-04-13
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/7.1/x86_64/os/
+
+ Scientific
+ 7.1
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-7.2.xml.in b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
new file mode 100644
index 0000000..ffc1762
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
@@ -0,0 +1,40 @@
+
+
+
+ scientificlinux7.2
+ <_name>Scientific Linux 7.2
+ 7.2
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2016-02-05
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/7.2/x86_64/os/
+
+ Scientific
+ 7.2
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-7.3.xml.in b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
new file mode 100644
index 0000000..a55a900
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
@@ -0,0 +1,40 @@
+
+
+
+ scientificlinux7.3
+ <_name>Scientific Linux 7.3
+ 7.3
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2017-01-25
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/7.3/x86_64/os/
+
+ Scientific
+ 7.3
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-7.4.xml.in b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
new file mode 100644
index 0000000..bc2b147
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
@@ -0,0 +1,40 @@
+
+
+
+ scientificlinux7.4
+ <_name>Scientific Linux 7.4
+ 7.4
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2017-10-02
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/7.4/x86_64/os/
+
+ Scientific
+ 7.4
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-7.5.xml.in b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
new file mode 100644
index 0000000..bb7a267
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
@@ -0,0 +1,40 @@
+
+
+
+ scientificlinux7.5
+ <_name>Scientific Linux 7.5
+ 7.5
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2018-05-10
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/7.5/x86_64/os/
+
+ Scientific
+ 7.5
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
diff --git a/data/os/scientificlinux.org/scientificlinux-7.6.xml.in b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
new file mode 100644
index 0000000..21bf964
--- /dev/null
+++ b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
@@ -0,0 +1,40 @@
+
+
+
+ scientificlinux7.6
+ <_name>Scientific Linux 7.6
+ 7.6
+ <_vendor>Scientific Linux
+ linux
+ scientificlinux
+
+
+
+ 2018-12-03
+
+
+ http://ftp1.scientificlinux.org/linux/scientific/7.6/x86_64/os/
+
+ Scientific
+ 7.6
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
--
2.20.1
From crobinso at redhat.com Fri Mar 1 23:43:11 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 1 Mar 2019 18:43:11 -0500
Subject: [Libosinfo] [PATCH osinfo-db 4/4] centos7: Fix treeinfo version
In-Reply-To:
References:
Message-ID:
On 3/1/19 3:54 PM, Cole Robinson wrote:
> The version field in all centos7 treeinfos I could find is 7, not 7.0
>
> Signed-off-by: Cole Robinson
> ---
> data/os/centos.org/centos-7.0.xml.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
> index 7532fca..8b874ee 100644
> --- a/data/os/centos.org/centos-7.0.xml.in
> +++ b/data/os/centos.org/centos-7.0.xml.in
> @@ -56,7 +56,7 @@
> http://mirror.centos.org/centos-7/7/os/x86_64/
>
> CentOS
> - 7.0
> + 7
> x86_64
>
>
>
This should be ^7 so it doesn't match 6.7 or 5.7 (which the patches I
just sent will add coverage for)
- Cole
From crobinso at redhat.com Sat Mar 2 21:09:51 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Sat, 2 Mar 2019 16:09:51 -0500
Subject: [Libosinfo] [PATCH osinfo-db] data: Remove hard tabs
Message-ID: <12eff708d2145c01140de6398a91e9ff460f10f8.1551560934.git.crobinso@redhat.com>
Most XML files are free of hard tabs, but some aren't, and it creates
weird visual indents in git diffs.
Let's standardize on _not_ using hard tabs
Signed-off-by: Cole Robinson
---
.../centos-kickstart-desktop.xml.in | 2 +-
.../centos.org/centos-kickstart-jeos.xml.in | 2 +-
.../fedora-kickstart-desktop.xml.in | 64 ++---
.../fedora-kickstart-jeos.xml.in | 60 ++--
.../silverblue-kickstart-desktop.xml.in | 2 +-
.../microsoft.com/windows-cmd-desktop.xml.in | 4 +-
.../microsoft.com/windows-reg-desktop.xml.in | 4 +-
.../microsoft.com/windows-sif-desktop.xml.in | 4 +-
.../microsoft.com/windows-sif-jeos.xml.in | 4 +-
.../windows-unattend-jeos.xml.in | 268 +++++++++---------
.../redhat.com/rhel-kickstart-desktop.xml.in | 2 +-
.../redhat.com/rhel-kickstart-jeos.xml.in | 2 +-
.../os/alpinelinux.org/alpinelinux-3.5.xml.in | 12 +-
.../os/alpinelinux.org/alpinelinux-3.6.xml.in | 12 +-
.../os/alpinelinux.org/alpinelinux-3.7.xml.in | 12 +-
data/os/debian.org/debian-9.xml.in | 12 +-
.../dragonflybsd-3.4.1.xml.in | 2 +-
data/os/fedoraproject.org/fedora-10.xml.in | 12 +-
data/os/fedoraproject.org/fedora-11.xml.in | 12 +-
data/os/fedoraproject.org/fedora-12.xml.in | 12 +-
data/os/fedoraproject.org/fedora-13.xml.in | 12 +-
data/os/fedoraproject.org/fedora-14.xml.in | 12 +-
data/os/fedoraproject.org/fedora-15.xml.in | 12 +-
data/os/fedoraproject.org/fedora-16.xml.in | 12 +-
data/os/fedoraproject.org/fedora-17.xml.in | 12 +-
data/os/fedoraproject.org/fedora-18.xml.in | 12 +-
data/os/fedoraproject.org/fedora-23.xml.in | 2 +-
data/os/fedoraproject.org/fedora-25.xml.in | 2 +-
data/os/fedoraproject.org/fedora-7.xml.in | 12 +-
data/os/fedoraproject.org/fedora-8.xml.in | 12 +-
data/os/fedoraproject.org/fedora-9.xml.in | 12 +-
data/os/freebsd.org/freebsd-12.0.xml.in | 2 +-
data/os/gentoo.org/gentoo-rolling.xml.in | 2 +-
data/os/openbsd.org/openbsd-4.2.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.3.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.4.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.5.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.8.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.9.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.0.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.1.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.2.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.3.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.4.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.5.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.6.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.7.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.8.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.9.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.0.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.1.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.2.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.3.xml.in | 16 +-
53 files changed, 470 insertions(+), 470 deletions(-)
diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
index 8702720..a1c3373 100644
--- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
@@ -190,7 +190,7 @@ AutomaticLogin=
" > /etc/gdm/custom.conf
%end
-
+
diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
index 0caf4f6..0f1efc2 100644
--- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
@@ -135,7 +135,7 @@ url --url="http://mirror.centos.org/centos//o
@core
%end
-
+
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index 0b1d77a..7d21715 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -58,42 +58,42 @@
-
-
-
- ext4
-
-
- ext3
-
-
-
-
-
-
-
- ext4
-
-
- ext3
-
-
-
-
-
-
-
+
+
+
+ ext4
+
+
+ ext3
+
+
+
+
+
+
+
+ ext4
+
+
+ ext3
+
+
+
+
+
+
+
-
-
+
+
- us
-
-
-
+ us
+
+
+
ks=
@@ -233,7 +233,7 @@ AutomaticLogin=
" > /etc/gdm/custom.conf
%end
-
+
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index d172392..28c6628 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -50,42 +50,42 @@
-
-
-
- ext4
-
-
- ext3
-
-
-
+
+
+
+ ext4
+
+
+ ext3
+
+
+
-
-
-
- ext4
-
-
- ext3
-
-
-
+
+
+
+ ext4
+
+
+ ext3
+
+
+
-
-
-
+
+
+
-
-
+
+
- us
-
-
-
+ us
+
+
+
ks=
@@ -167,7 +167,7 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$release
%end
-
+
diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
index d044f74..17841bf 100644
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -116,7 +116,7 @@ rm -f /etc/ostree/remotes.d/fedora-''.conf
ostree remote add --if-not-exists --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora--primary fedora- 'https://dl.fedoraproject.org/atomic/repo/'
%end
-
+
diff --git a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
index 9060877..7fee340 100644
--- a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
@@ -78,7 +78,7 @@
-
+
sc config TlntSvr start= auto
net user /add /passwordreq:no
@@ -98,7 +98,7 @@ bcdedit.exe -set TESTSIGNING ON
for %%i in (":\*.cmd") do cmd /c %%i
EXIT
-
+
diff --git a/data/install-script/microsoft.com/windows-reg-desktop.xml.in b/data/install-script/microsoft.com/windows-reg-desktop.xml.in
index 61fbb5b..dc8020b 100644
--- a/data/install-script/microsoft.com/windows-reg-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-reg-desktop.xml.in
@@ -17,14 +17,14 @@
-
+
Windows Registry Editor Version 5.00.
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon]
"DefaultUserName"=""
"DefaultPassword"=""
"AutoAdminLogon"="1"
-
+
diff --git a/data/install-script/microsoft.com/windows-sif-desktop.xml.in b/data/install-script/microsoft.com/windows-sif-desktop.xml.in
index 8494471..bfae72a 100644
--- a/data/install-script/microsoft.com/windows-sif-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-sif-desktop.xml.in
@@ -52,7 +52,7 @@
-
+
;SetupMgrTag
[Data]
AutoPartition=1
@@ -142,7 +142,7 @@
[WindowsFirewall.TurnOffFirewall]
Mode = 0
-
+
diff --git a/data/install-script/microsoft.com/windows-sif-jeos.xml.in b/data/install-script/microsoft.com/windows-sif-jeos.xml.in
index c2af8d2..392a690 100644
--- a/data/install-script/microsoft.com/windows-sif-jeos.xml.in
+++ b/data/install-script/microsoft.com/windows-sif-jeos.xml.in
@@ -21,7 +21,7 @@
-
+
;SetupMgrTag
[Data]
AutoPartition=1
@@ -66,7 +66,7 @@
[Networking]
InstallDefaultComponents=Yes
-
+
diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
index 1769c2c..78b75db 100644
--- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
@@ -38,19 +38,19 @@
-
-
-
- amd64
-
-
- x86
-
-
- x86
-
-
-
+
+
+
+ amd64
+
+
+ x86
+
+
+ x86
+
+
+
@@ -85,9 +85,9 @@
-
-
-
+
+
+
@@ -98,131 +98,131 @@
-
-
-
-
-
- OnError
-
-
-
- 1
- 1
- Primary
-
-
- 0
- true
-
-
- true
- true
- NTFS
+
+
+
+
+
+ OnError
+
+
+
+ 1
+ 1
+ Primary
+
+
+ 0
+ true
+
+
+ true
+ true
+ NTFS
- 1
- 1
-
-
-
-
-
-
-
- 0
- 1
-
- OnError
-
-
-
- true
+ 1
+ 1
+
+
+
+
+
+
+
+ 0
+ 1
+
+ OnError
+
+
+
+ true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
-
-
-
-
-
- true
-
-
-
- Users
-
-
-
-
-
-
-
-
- true
-
- true
- 5
-
-
-
-
- Work
- true
- 3
- true
- true
-
-
-
- 1
- Turn Off Network Selection pop-up
- cmd /c reg add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff"
-
-
- 2
- Shutting down Windows
- cmd /C shutdown /s /t 0
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ true
+
+
+
+ Users
+
+
+
+
+
+
+
+
+ true
+
+ true
+ 5
+
+
+
+
+ Work
+ true
+ 3
+ true
+ true
+
+
+
+ 1
+ Turn Off Network Selection pop-up
+ cmd /c reg add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff"
+
+
+ 2
+ Shutting down Windows
+ cmd /C shutdown /s /t 0
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index dfed40d..e2349d2 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -153,7 +153,7 @@ AutomaticLogin=
" > /etc/gdm/custom.conf
%end
-
+
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index 006e362..8c0b42d 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -100,7 +100,7 @@ reboot
@core
%end
-
+
diff --git a/data/os/alpinelinux.org/alpinelinux-3.5.xml.in b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
index 31ec81a..41d89b4 100644
--- a/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
+++ b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
@@ -12,15 +12,15 @@
1000000000
- 1
- 134217728
- 1073741824
+ 1
+ 134217728
+ 1073741824
1000000000
- 1
- 805306368
- 4294967296
+ 1
+ 805306368
+ 4294967296
diff --git a/data/os/alpinelinux.org/alpinelinux-3.6.xml.in b/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
index 67e8f4d..911b7d1 100644
--- a/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
+++ b/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
@@ -15,15 +15,15 @@
1000000000
- 1
- 134217728
- 1073741824
+ 1
+ 134217728
+ 1073741824
1000000000
- 1
- 805306368
- 4294967296
+ 1
+ 805306368
+ 4294967296
diff --git a/data/os/alpinelinux.org/alpinelinux-3.7.xml.in b/data/os/alpinelinux.org/alpinelinux-3.7.xml.in
index 9e2cdfb..5549376 100644
--- a/data/os/alpinelinux.org/alpinelinux-3.7.xml.in
+++ b/data/os/alpinelinux.org/alpinelinux-3.7.xml.in
@@ -15,15 +15,15 @@
1000000000
- 1
- 134217728
- 1073741824
+ 1
+ 134217728
+ 1073741824
1000000000
- 1
- 805306368
- 4294967296
+ 1
+ 805306368
+ 4294967296
diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index f3a0d58..7ff402b 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -63,7 +63,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-cd/debian-9.8.0-amd64-netinst.iso
- Debian 9.(\d)+.(\d)+ amd64 n
+ Debian 9.(\d)+.(\d)+ amd64 n
install.amd/vmlinuz
install.amd/initrd.gz
@@ -72,7 +72,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-cd/debian-9.8.0-arm64-netinst.iso
- Debian 9.(\d)+.(\d)+ arm64 n
+ Debian 9.(\d)+.(\d)+ arm64 n
install.arm64/vmlinuz
install.arm64/initrd.gz
@@ -81,7 +81,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-cd/debian-9.8.0-armhf-netinst.iso
- Debian 9.(\d)+.(\d)+ armhf n
+ Debian 9.(\d)+.(\d)+ armhf n
install.armhf/vmlinuz
install.armhf/initrd.gz
@@ -101,7 +101,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-dvd/debian-9.8.0-amd64-DVD-1.iso
- Debian 9.(\d)+.(\d)+ amd64 1
+ Debian 9.(\d)+.(\d)+ amd64 1
install.amd/vmlinuz
install.amd/initrd.gz
@@ -110,7 +110,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-dvd/debian-9.8.0-arm64-DVD-1.iso
- Debian 9.(\d)+.(\d)+ arm64 1
+ Debian 9.(\d)+.(\d)+ arm64 1
install.arm64/vmlinuz
install.arm64/initrd.gz
@@ -119,7 +119,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-dvd/debian-9.8.0-armhf-DVD-1.iso
- Debian 9.(\d)+.(\d)+ armhf 1
+ Debian 9.(\d)+.(\d)+ armhf 1
install.armhf/vmlinuz
install.armhf/initrd.gz
diff --git a/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in b/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in
index edfdec1..38a445d 100644
--- a/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in
+++ b/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in
@@ -10,6 +10,6 @@
<_vendor>DragonFlyBSD Project
- 2013-04-29
+ 2013-04-29
diff --git a/data/os/fedoraproject.org/fedora-10.xml.in b/data/os/fedoraproject.org/fedora-10.xml.in
index 9ce4d62..49a9109 100644
--- a/data/os/fedoraproject.org/fedora-10.xml.in
+++ b/data/os/fedoraproject.org/fedora-10.xml.in
@@ -336,17 +336,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/os/
- Fedora
- 10
- i386
+ Fedora
+ 10
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/os/
- Fedora
- 10
- x86_64
+ Fedora
+ 10
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-11.xml.in b/data/os/fedoraproject.org/fedora-11.xml.in
index ff2a21e..cd8f206 100644
--- a/data/os/fedoraproject.org/fedora-11.xml.in
+++ b/data/os/fedoraproject.org/fedora-11.xml.in
@@ -334,17 +334,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/os/
- Fedora
- 11
- i386
+ Fedora
+ 11
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/os/
- Fedora
- 11
- x86_64
+ Fedora
+ 11
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-12.xml.in b/data/os/fedoraproject.org/fedora-12.xml.in
index ce50728..b549fdf 100644
--- a/data/os/fedoraproject.org/fedora-12.xml.in
+++ b/data/os/fedoraproject.org/fedora-12.xml.in
@@ -294,17 +294,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/os/
- Fedora
- 12
- i386
+ Fedora
+ 12
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/os/
- Fedora
- 12
- x86_64
+ Fedora
+ 12
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-13.xml.in b/data/os/fedoraproject.org/fedora-13.xml.in
index dfac0eb..535c620 100644
--- a/data/os/fedoraproject.org/fedora-13.xml.in
+++ b/data/os/fedoraproject.org/fedora-13.xml.in
@@ -210,17 +210,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/os/
- Fedora
- 13
- i386
+ Fedora
+ 13
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/os/
- Fedora
- 13
- x86_64
+ Fedora
+ 13
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-14.xml.in b/data/os/fedoraproject.org/fedora-14.xml.in
index 6cd0099..01223fe 100644
--- a/data/os/fedoraproject.org/fedora-14.xml.in
+++ b/data/os/fedoraproject.org/fedora-14.xml.in
@@ -210,17 +210,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/os/
- Fedora
- 14
- i386
+ Fedora
+ 14
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/os/
- Fedora
- 14
- x86_64
+ Fedora
+ 14
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-15.xml.in b/data/os/fedoraproject.org/fedora-15.xml.in
index d3ee3c1..1320605 100644
--- a/data/os/fedoraproject.org/fedora-15.xml.in
+++ b/data/os/fedoraproject.org/fedora-15.xml.in
@@ -88,17 +88,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/i386/os/
- Fedora
- 15
- i386
+ Fedora
+ 15
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/x86_64/os/
- Fedora
- 15
- x86_64
+ Fedora
+ 15
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-16.xml.in b/data/os/fedoraproject.org/fedora-16.xml.in
index c915a25..5872a2a 100644
--- a/data/os/fedoraproject.org/fedora-16.xml.in
+++ b/data/os/fedoraproject.org/fedora-16.xml.in
@@ -88,17 +88,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/i386/os/
- Fedora
- 16
- i386
+ Fedora
+ 16
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/x86_64/os/
- Fedora
- 16
- x86_64
+ Fedora
+ 16
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-17.xml.in b/data/os/fedoraproject.org/fedora-17.xml.in
index 9450a08..6175845 100644
--- a/data/os/fedoraproject.org/fedora-17.xml.in
+++ b/data/os/fedoraproject.org/fedora-17.xml.in
@@ -92,17 +92,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/i386/os/
- Fedora
- 17
- i386
+ Fedora
+ 17
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/
- Fedora
- 17
- x86_64
+ Fedora
+ 17
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-18.xml.in b/data/os/fedoraproject.org/fedora-18.xml.in
index b31573c..db8be83 100644
--- a/data/os/fedoraproject.org/fedora-18.xml.in
+++ b/data/os/fedoraproject.org/fedora-18.xml.in
@@ -88,17 +88,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/i386/os/
- Fedora
- 18
- i386
+ Fedora
+ 18
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/x86_64/os/
- Fedora
- 18
- x86_64
+ Fedora
+ 18
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index 48c271b..9a3ce13 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -37,7 +37,7 @@
+ pretend its just not available until F24 to avoid bug reports -->
diff --git a/data/os/fedoraproject.org/fedora-25.xml.in b/data/os/fedoraproject.org/fedora-25.xml.in
index 64ae1de..41a0544 100644
--- a/data/os/fedoraproject.org/fedora-25.xml.in
+++ b/data/os/fedoraproject.org/fedora-25.xml.in
@@ -86,7 +86,7 @@
https://fedorahosted.org/rel-eng/ticket/6173
-->
- 2113044480
+ 2113044480
isolinux/vmlinuz
isolinux/initrd.img
diff --git a/data/os/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
index 03b15ba..0b0701d 100644
--- a/data/os/fedoraproject.org/fedora-7.xml.in
+++ b/data/os/fedoraproject.org/fedora-7.xml.in
@@ -97,17 +97,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/
- Fedora
- 7
- i386
+ Fedora
+ 7
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/
- Fedora
- 7
- x86_64
+ Fedora
+ 7
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
index 8aae791..b10bcf4 100644
--- a/data/os/fedoraproject.org/fedora-8.xml.in
+++ b/data/os/fedoraproject.org/fedora-8.xml.in
@@ -109,17 +109,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/
- Fedora
- 8
- i386
+ Fedora
+ 8
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/
- Fedora
- 8
- x86_64
+ Fedora
+ 8
+ x86_64
diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
index fff246d..cb100a2 100644
--- a/data/os/fedoraproject.org/fedora-9.xml.in
+++ b/data/os/fedoraproject.org/fedora-9.xml.in
@@ -350,17 +350,17 @@
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/
- Fedora
- 9
- i386
+ Fedora
+ 9
+ i386
http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/
- Fedora
- 9
- x86_64
+ Fedora
+ 9
+ x86_64
diff --git a/data/os/freebsd.org/freebsd-12.0.xml.in b/data/os/freebsd.org/freebsd-12.0.xml.in
index 9ed317a..d084b58 100644
--- a/data/os/freebsd.org/freebsd-12.0.xml.in
+++ b/data/os/freebsd.org/freebsd-12.0.xml.in
@@ -35,7 +35,7 @@
- https://download.freebsd.org/ftp/releases/i386/i386/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-i386-disc1.iso
+ https://download.freebsd.org/ftp/releases/i386/i386/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-i386-disc1.iso
FreeBSD
12_0_RELEASE_I386_CD
diff --git a/data/os/gentoo.org/gentoo-rolling.xml.in b/data/os/gentoo.org/gentoo-rolling.xml.in
index 6b8159b..8ba9187 100644
--- a/data/os/gentoo.org/gentoo-rolling.xml.in
+++ b/data/os/gentoo.org/gentoo-rolling.xml.in
@@ -40,7 +40,7 @@
268435456
- 2952790016
+ 2952790016
diff --git a/data/os/openbsd.org/openbsd-4.2.xml.in b/data/os/openbsd.org/openbsd-4.2.xml.in
index 5ce9d7a..d499713 100644
--- a/data/os/openbsd.org/openbsd-4.2.xml.in
+++ b/data/os/openbsd.org/openbsd-4.2.xml.in
@@ -14,19 +14,19 @@
- Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 4.2 Install CD
- OpenBSD 4.2 i386 Install CD
+ Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 4.2 Install CD
+ OpenBSD 4.2 i386 Install CD
- Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 4.2 Install CD
- OpenBSD 4.2 amd64 Install CD
+ Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 4.2 Install CD
+ OpenBSD 4.2 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-4.3.xml.in b/data/os/openbsd.org/openbsd-4.3.xml.in
index eadb220..a971d09 100644
--- a/data/os/openbsd.org/openbsd-4.3.xml.in
+++ b/data/os/openbsd.org/openbsd-4.3.xml.in
@@ -16,19 +16,19 @@
- Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 4.3 Install CD
- OpenBSD 4.3 i386 Install CD
+ Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 4.3 Install CD
+ OpenBSD 4.3 i386 Install CD
- Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 4.3 Install CD
- OpenBSD 4.3 amd64 Install CD
+ Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 4.3 Install CD
+ OpenBSD 4.3 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-4.4.xml.in b/data/os/openbsd.org/openbsd-4.4.xml.in
index d28eaf8..f1d4e6c 100644
--- a/data/os/openbsd.org/openbsd-4.4.xml.in
+++ b/data/os/openbsd.org/openbsd-4.4.xml.in
@@ -16,19 +16,19 @@
- Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 4.4 Install CD
- OpenBSD 4.4 i386 Install CD
+ Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 4.4 Install CD
+ OpenBSD 4.4 i386 Install CD
- Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 4.4 Install CD
- OpenBSD 4.4 amd64 Install CD
+ Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 4.4 Install CD
+ OpenBSD 4.4 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-4.5.xml.in b/data/os/openbsd.org/openbsd-4.5.xml.in
index f408ccc..32130fe 100644
--- a/data/os/openbsd.org/openbsd-4.5.xml.in
+++ b/data/os/openbsd.org/openbsd-4.5.xml.in
@@ -16,19 +16,19 @@
- Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 4.5 Install CD
- OpenBSD 4.5 i386 Install CD
+ Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 4.5 Install CD
+ OpenBSD 4.5 i386 Install CD
- Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 4.5 Install CD
- OpenBSD 4.5 amd64 Install CD
+ Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 4.5 Install CD
+ OpenBSD 4.5 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-4.8.xml.in b/data/os/openbsd.org/openbsd-4.8.xml.in
index 116ddd5..928f079 100644
--- a/data/os/openbsd.org/openbsd-4.8.xml.in
+++ b/data/os/openbsd.org/openbsd-4.8.xml.in
@@ -16,19 +16,19 @@
- Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 4.8 Install CD
- OpenBSD 4.8 i386 Install CD
+ Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 4.8 Install CD
+ OpenBSD 4.8 i386 Install CD
- Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 4.8 Install CD
- OpenBSD 4.8 amd64 Install CD
+ Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 4.8 Install CD
+ OpenBSD 4.8 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-4.9.xml.in b/data/os/openbsd.org/openbsd-4.9.xml.in
index af70769..23cb033 100644
--- a/data/os/openbsd.org/openbsd-4.9.xml.in
+++ b/data/os/openbsd.org/openbsd-4.9.xml.in
@@ -20,19 +20,19 @@
- Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 4.9 Install CD
- OpenBSD 4.9 i386 Install CD
+ Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 4.9 Install CD
+ OpenBSD 4.9 i386 Install CD
- Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 4.9 Install CD
- OpenBSD 4.9 amd64 Install CD
+ Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 4.9 Install CD
+ OpenBSD 4.9 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.0.xml.in b/data/os/openbsd.org/openbsd-5.0.xml.in
index ef3f3e7..38f2e75 100644
--- a/data/os/openbsd.org/openbsd-5.0.xml.in
+++ b/data/os/openbsd.org/openbsd-5.0.xml.in
@@ -16,19 +16,19 @@
- Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.0 Install CD
- OpenBSD 5.0 i386 Install CD
+ Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.0 Install CD
+ OpenBSD 5.0 i386 Install CD
- Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.0 Install CD
- OpenBSD 5.0 amd64 Install CD
+ Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.0 Install CD
+ OpenBSD 5.0 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.1.xml.in b/data/os/openbsd.org/openbsd-5.1.xml.in
index 4395096..cb650d4 100644
--- a/data/os/openbsd.org/openbsd-5.1.xml.in
+++ b/data/os/openbsd.org/openbsd-5.1.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.1 Install CD
- OpenBSD 5.1 i386 Install CD
+ Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.1 Install CD
+ OpenBSD 5.1 i386 Install CD
- Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.1 Install CD
- OpenBSD 5.1 amd64 Install CD
+ Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.1 Install CD
+ OpenBSD 5.1 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.2.xml.in b/data/os/openbsd.org/openbsd-5.2.xml.in
index 2fd52d9..12549db 100644
--- a/data/os/openbsd.org/openbsd-5.2.xml.in
+++ b/data/os/openbsd.org/openbsd-5.2.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.2 Install CD
- OpenBSD 5.2 i386 Install CD
+ Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.2 Install CD
+ OpenBSD 5.2 i386 Install CD
- Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.2 Install CD
- OpenBSD 5.2 amd64 Install CD
+ Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.2 Install CD
+ OpenBSD 5.2 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.3.xml.in b/data/os/openbsd.org/openbsd-5.3.xml.in
index 2a276df..de43d57 100644
--- a/data/os/openbsd.org/openbsd-5.3.xml.in
+++ b/data/os/openbsd.org/openbsd-5.3.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.3 Install CD
- OpenBSD 5.3 i386 Install CD
+ Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.3 Install CD
+ OpenBSD 5.3 i386 Install CD
- Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.3 Install CD
- OpenBSD 5.3 amd64 Install CD
+ Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.3 Install CD
+ OpenBSD 5.3 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.4.xml.in b/data/os/openbsd.org/openbsd-5.4.xml.in
index b3fb08f..fc08332 100644
--- a/data/os/openbsd.org/openbsd-5.4.xml.in
+++ b/data/os/openbsd.org/openbsd-5.4.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.4 Install CD
- OpenBSD 5.4 i386 Install CD
+ Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.4 Install CD
+ OpenBSD 5.4 i386 Install CD
- Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.4 Install CD
- OpenBSD 5.4 amd64 Install CD
+ Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.4 Install CD
+ OpenBSD 5.4 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.5.xml.in b/data/os/openbsd.org/openbsd-5.5.xml.in
index 155e3da..47c2a5a 100644
--- a/data/os/openbsd.org/openbsd-5.5.xml.in
+++ b/data/os/openbsd.org/openbsd-5.5.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.5 Install CD
- OpenBSD 5.5 i386 Install CD
+ Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.5 Install CD
+ OpenBSD 5.5 i386 Install CD
- Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.5 Install CD
- OpenBSD 5.5 amd64 Install CD
+ Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.5 Install CD
+ OpenBSD 5.5 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.6.xml.in b/data/os/openbsd.org/openbsd-5.6.xml.in
index fed2e34..39efb88 100644
--- a/data/os/openbsd.org/openbsd-5.6.xml.in
+++ b/data/os/openbsd.org/openbsd-5.6.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.6 Install CD
- OpenBSD 5.6 i386 Install CD
+ Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.6 Install CD
+ OpenBSD 5.6 i386 Install CD
- Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.6 Install CD
- OpenBSD 5.6 amd64 Install CD
+ Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.6 Install CD
+ OpenBSD 5.6 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.7.xml.in b/data/os/openbsd.org/openbsd-5.7.xml.in
index 666ffc8..187e3e9 100644
--- a/data/os/openbsd.org/openbsd-5.7.xml.in
+++ b/data/os/openbsd.org/openbsd-5.7.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.7 Install CD
- OpenBSD 5.7 i386 Install CD
+ Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.7 Install CD
+ OpenBSD 5.7 i386 Install CD
- Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.7 Install CD
- OpenBSD 5.7 amd64 Install CD
+ Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.7 Install CD
+ OpenBSD 5.7 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.8.xml.in b/data/os/openbsd.org/openbsd-5.8.xml.in
index 4f120d0..21c3643 100644
--- a/data/os/openbsd.org/openbsd-5.8.xml.in
+++ b/data/os/openbsd.org/openbsd-5.8.xml.in
@@ -15,19 +15,19 @@
- Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.8 Install CD
- OpenBSD 5.8 i386 Install CD
+ Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.8 Install CD
+ OpenBSD 5.8 i386 Install CD
- Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.8 Install CD
- OpenBSD 5.8 amd64 Install CD
+ Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.8 Install CD
+ OpenBSD 5.8 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-5.9.xml.in b/data/os/openbsd.org/openbsd-5.9.xml.in
index a94c9b7..aad3f93 100644
--- a/data/os/openbsd.org/openbsd-5.9.xml.in
+++ b/data/os/openbsd.org/openbsd-5.9.xml.in
@@ -15,20 +15,20 @@
https://ftp.eu.openbsd.org/pub/OpenBSD/5.9/i386/install59.iso
- Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 5.9 Install CD
- OpenBSD 5.9 i386 Install CD
+ Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 5.9 Install CD
+ OpenBSD 5.9 i386 Install CD
https://ftp.eu.openbsd.org/pub/OpenBSD/5.9/amd64/install59.iso
- Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 5.9 Install CD
- OpenBSD 5.9 amd64 Install CD
+ Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 5.9 Install CD
+ OpenBSD 5.9 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-6.0.xml.in b/data/os/openbsd.org/openbsd-6.0.xml.in
index 3fc7551..52d8098 100644
--- a/data/os/openbsd.org/openbsd-6.0.xml.in
+++ b/data/os/openbsd.org/openbsd-6.0.xml.in
@@ -15,20 +15,20 @@
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.0/i386/install60.iso
- Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 6.0 Install CD
- OpenBSD 6.0 i386 Install CD
+ Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 6.0 Install CD
+ OpenBSD 6.0 i386 Install CD
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.0/amd64/install60.iso
- Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 6.0 Install CD
- OpenBSD 6.0 amd64 Install CD
+ Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 6.0 Install CD
+ OpenBSD 6.0 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-6.1.xml.in b/data/os/openbsd.org/openbsd-6.1.xml.in
index f98c034..7d9b608 100644
--- a/data/os/openbsd.org/openbsd-6.1.xml.in
+++ b/data/os/openbsd.org/openbsd-6.1.xml.in
@@ -15,20 +15,20 @@
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.1/i386/install61.iso
- Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 6.1 Install CD
- OpenBSD 6.1 i386 Install CD
+ Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 6.1 Install CD
+ OpenBSD 6.1 i386 Install CD
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.1/amd64/install61.iso
- Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 6.1 Install CD
- OpenBSD 6.1 amd64 Install CD
+ Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 6.1 Install CD
+ OpenBSD 6.1 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-6.2.xml.in b/data/os/openbsd.org/openbsd-6.2.xml.in
index 7cdebd2..5600c51 100644
--- a/data/os/openbsd.org/openbsd-6.2.xml.in
+++ b/data/os/openbsd.org/openbsd-6.2.xml.in
@@ -15,20 +15,20 @@
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/i386/install62.iso
- Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 6.2 Install CD
- OpenBSD 6.2 i386 Install CD
+ Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 6.2 Install CD
+ OpenBSD 6.2 i386 Install CD
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/amd64/install62.iso
- Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 6.2 Install CD
- OpenBSD 6.2 amd64 Install CD
+ Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 6.2 Install CD
+ OpenBSD 6.2 amd64 Install CD
diff --git a/data/os/openbsd.org/openbsd-6.3.xml.in b/data/os/openbsd.org/openbsd-6.3.xml.in
index ec59c8e..21ea01a 100644
--- a/data/os/openbsd.org/openbsd-6.3.xml.in
+++ b/data/os/openbsd.org/openbsd-6.3.xml.in
@@ -15,20 +15,20 @@
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.3/i386/install63.iso
- Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/i386 6.3 Install CD
- OpenBSD 6.3 i386 Install CD
+ Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/i386 6.3 Install CD
+ OpenBSD 6.3 i386 Install CD
https://fastly.cdn.openbsd.org/pub/OpenBSD/6.3/amd64/install63.iso
- Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project
- OpenBSD
- OpenBSD/amd64 6.3 Install CD
- OpenBSD 6.3 amd64 Install CD
+ Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project
+ OpenBSD
+ OpenBSD/amd64 6.3 Install CD
+ OpenBSD 6.3 amd64 Install CD
--
2.20.1
From crobinso at redhat.com Sat Mar 2 21:10:03 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Sat, 2 Mar 2019 16:10:03 -0500
Subject: [Libosinfo] [PATCH osinfo-db] Add .editorconfig
Message-ID: <28c153dee7004b4db52c2eade92084becb1ee782.1551560921.git.crobinso@redhat.com>
editorconfig[1] defines a file format for specifying basic coding style
rules, and a bunch of editor plugins to make use of the rules.
Add an .editorconfig file to indicate our XML format is 2 space indent
with no hard tabs
[1]: https://editorconfig.org/
Signed-off-by: Cole Robinson
---
.editorconfig | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .editorconfig
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..6d0b448
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*.xml.in]
+indent_style = space
+indent_size = 2
--
2.20.1
From crobinso at redhat.com Sat Mar 2 23:35:16 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Sat, 2 Mar 2019 18:35:16 -0500
Subject: [Libosinfo] [PATCH libosinfo 0/2] Add editorconfig,
drop emacs annotations
Message-ID:
Add an .editorconfig file and use it to drop 'Local variables'
annotations in all our code files
Cole Robinson (2):
Add .editorconfig
Remove emacs 'Local variables' annotations
.editorconfig | 3 +++
osinfo/osinfo.h | 7 -------
osinfo/osinfo_avatar_format.c | 8 --------
osinfo/osinfo_avatar_format.h | 7 -------
osinfo/osinfo_datamap.c | 8 --------
osinfo/osinfo_datamap.h | 7 -------
osinfo/osinfo_datamaplist.c | 8 --------
osinfo/osinfo_datamaplist.h | 7 -------
osinfo/osinfo_db.c | 7 -------
osinfo/osinfo_db.h | 7 -------
osinfo/osinfo_deployment.c | 7 -------
osinfo/osinfo_deployment.h | 7 -------
osinfo/osinfo_deploymentlist.c | 8 --------
osinfo/osinfo_deploymentlist.h | 7 -------
osinfo/osinfo_device.c | 8 --------
osinfo/osinfo_device.h | 7 -------
osinfo/osinfo_device_driver.c | 8 --------
osinfo/osinfo_device_driver.h | 7 -------
osinfo/osinfo_device_driver_private.h | 8 --------
osinfo/osinfo_device_driverlist.c | 8 --------
osinfo/osinfo_device_driverlist.h | 7 -------
osinfo/osinfo_devicelink.c | 8 --------
osinfo/osinfo_devicelink.h | 7 -------
osinfo/osinfo_devicelinkfilter.c | 8 --------
osinfo/osinfo_devicelinkfilter.h | 7 -------
osinfo/osinfo_devicelinklist.c | 9 ---------
osinfo/osinfo_devicelinklist.h | 7 -------
osinfo/osinfo_devicelist.c | 8 --------
osinfo/osinfo_devicelist.h | 7 -------
osinfo/osinfo_entity.c | 9 ---------
osinfo/osinfo_entity.h | 7 -------
osinfo/osinfo_filter.c | 7 -------
osinfo/osinfo_filter.h | 7 -------
osinfo/osinfo_image.c | 8 --------
osinfo/osinfo_image.h | 7 -------
osinfo/osinfo_imagelist.c | 8 --------
osinfo/osinfo_imagelist.h | 7 -------
osinfo/osinfo_install_config.c | 8 --------
osinfo/osinfo_install_config.h | 7 -------
osinfo/osinfo_install_config_param.c | 8 --------
osinfo/osinfo_install_config_param.h | 7 -------
osinfo/osinfo_install_config_paramlist.c | 8 --------
osinfo/osinfo_install_config_paramlist.h | 7 -------
osinfo/osinfo_install_script.c | 8 --------
osinfo/osinfo_install_script.h | 7 -------
osinfo/osinfo_install_script_private.h | 7 -------
osinfo/osinfo_install_scriptlist.c | 8 --------
osinfo/osinfo_install_scriptlist.h | 7 -------
osinfo/osinfo_list.c | 9 ---------
osinfo/osinfo_list.h | 7 -------
osinfo/osinfo_loader.c | 8 --------
osinfo/osinfo_loader.h | 7 -------
osinfo/osinfo_media.c | 8 --------
osinfo/osinfo_media.h | 7 -------
osinfo/osinfo_media_private.h | 7 -------
osinfo/osinfo_medialist.c | 8 --------
osinfo/osinfo_medialist.h | 7 -------
osinfo/osinfo_os.c | 8 --------
osinfo/osinfo_os.h | 7 -------
osinfo/osinfo_os_variant.c | 7 -------
osinfo/osinfo_os_variant.h | 7 -------
osinfo/osinfo_os_variantlist.c | 8 --------
osinfo/osinfo_os_variantlist.h | 7 -------
osinfo/osinfo_oslist.c | 8 --------
osinfo/osinfo_oslist.h | 7 -------
osinfo/osinfo_platform.c | 7 -------
osinfo/osinfo_platform.h | 7 -------
osinfo/osinfo_platformlist.c | 8 --------
osinfo/osinfo_platformlist.h | 7 -------
osinfo/osinfo_product.c | 8 --------
osinfo/osinfo_product.h | 7 -------
osinfo/osinfo_product_private.h | 8 --------
osinfo/osinfo_productfilter.c | 8 --------
osinfo/osinfo_productfilter.h | 7 -------
osinfo/osinfo_productlist.c | 8 --------
osinfo/osinfo_productlist.h | 7 -------
osinfo/osinfo_resources.c | 8 --------
osinfo/osinfo_resources.h | 7 -------
osinfo/osinfo_resources_private.h | 8 --------
osinfo/osinfo_resourceslist.c | 8 --------
osinfo/osinfo_resourceslist.h | 7 -------
osinfo/osinfo_tree.c | 8 --------
osinfo/osinfo_tree.h | 7 -------
osinfo/osinfo_treelist.c | 8 --------
osinfo/osinfo_treelist.h | 7 -------
tests/test-db.c | 7 -------
tests/test-device.c | 7 -------
tests/test-devicelinklist.c | 7 -------
tests/test-devicelist.c | 7 -------
tests/test-entity.c | 7 -------
tests/test-filter.c | 7 -------
tests/test-image.c | 7 -------
tests/test-imagelist.c | 7 -------
tests/test-imageuris.c | 7 -------
tests/test-install-script.c | 7 -------
tests/test-isodetect.c | 7 -------
tests/test-list.c | 7 -------
tests/test-loader.c | 7 -------
tests/test-media.c | 7 -------
tests/test-mediauris.c | 7 -------
tests/test-os.c | 7 -------
tests/test-oslist.c | 7 -------
tests/test-platform.c | 7 -------
tests/test-platformlist.c | 7 -------
tests/test-product.c | 7 -------
tests/test-productfilter.c | 7 -------
tests/test-treeuris.c | 7 -------
tools/osinfo-detect.c | 8 --------
tools/osinfo-install-script.c | 8 --------
tools/osinfo-query.c | 8 --------
110 files changed, 3 insertions(+), 806 deletions(-)
create mode 100644 .editorconfig
--
2.20.1
From crobinso at redhat.com Sat Mar 2 23:35:17 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Sat, 2 Mar 2019 18:35:17 -0500
Subject: [Libosinfo] [PATCH libosinfo 1/2] Add .editorconfig
In-Reply-To:
References:
Message-ID:
editorconfig[1] defines a file format for specifying basic coding style
rules, and a bunch of editor plugins to make use of the rules.
Add an .editorconfig file to indicate our c format of 4 space soft tabs
[1]: https://editorconfig.org/
Signed-off-by: Cole Robinson
---
.editorconfig | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .editorconfig
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..511dce8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*.{h,c}]
+indent_style = space
+indent_size = 4
--
2.20.1
From crobinso at redhat.com Sat Mar 2 23:35:18 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Sat, 2 Mar 2019 18:35:18 -0500
Subject: [Libosinfo] [PATCH libosinfo 2/2] Remove emacs 'Local variables'
annotations
In-Reply-To:
References:
Message-ID:
No other virt projects have annotations like this, plus IMO
.editorconfig handles this in a much nicer way and more flexible
way. Ditch them
Signed-off-by: Cole Robinson
---
osinfo/osinfo.h | 7 -------
osinfo/osinfo_avatar_format.c | 8 --------
osinfo/osinfo_avatar_format.h | 7 -------
osinfo/osinfo_datamap.c | 8 --------
osinfo/osinfo_datamap.h | 7 -------
osinfo/osinfo_datamaplist.c | 8 --------
osinfo/osinfo_datamaplist.h | 7 -------
osinfo/osinfo_db.c | 7 -------
osinfo/osinfo_db.h | 7 -------
osinfo/osinfo_deployment.c | 7 -------
osinfo/osinfo_deployment.h | 7 -------
osinfo/osinfo_deploymentlist.c | 8 --------
osinfo/osinfo_deploymentlist.h | 7 -------
osinfo/osinfo_device.c | 8 --------
osinfo/osinfo_device.h | 7 -------
osinfo/osinfo_device_driver.c | 8 --------
osinfo/osinfo_device_driver.h | 7 -------
osinfo/osinfo_device_driver_private.h | 8 --------
osinfo/osinfo_device_driverlist.c | 8 --------
osinfo/osinfo_device_driverlist.h | 7 -------
osinfo/osinfo_devicelink.c | 8 --------
osinfo/osinfo_devicelink.h | 7 -------
osinfo/osinfo_devicelinkfilter.c | 8 --------
osinfo/osinfo_devicelinkfilter.h | 7 -------
osinfo/osinfo_devicelinklist.c | 9 ---------
osinfo/osinfo_devicelinklist.h | 7 -------
osinfo/osinfo_devicelist.c | 8 --------
osinfo/osinfo_devicelist.h | 7 -------
osinfo/osinfo_entity.c | 9 ---------
osinfo/osinfo_entity.h | 7 -------
osinfo/osinfo_filter.c | 7 -------
osinfo/osinfo_filter.h | 7 -------
osinfo/osinfo_image.c | 8 --------
osinfo/osinfo_image.h | 7 -------
osinfo/osinfo_imagelist.c | 8 --------
osinfo/osinfo_imagelist.h | 7 -------
osinfo/osinfo_install_config.c | 8 --------
osinfo/osinfo_install_config.h | 7 -------
osinfo/osinfo_install_config_param.c | 8 --------
osinfo/osinfo_install_config_param.h | 7 -------
osinfo/osinfo_install_config_paramlist.c | 8 --------
osinfo/osinfo_install_config_paramlist.h | 7 -------
osinfo/osinfo_install_script.c | 8 --------
osinfo/osinfo_install_script.h | 7 -------
osinfo/osinfo_install_script_private.h | 7 -------
osinfo/osinfo_install_scriptlist.c | 8 --------
osinfo/osinfo_install_scriptlist.h | 7 -------
osinfo/osinfo_list.c | 9 ---------
osinfo/osinfo_list.h | 7 -------
osinfo/osinfo_loader.c | 8 --------
osinfo/osinfo_loader.h | 7 -------
osinfo/osinfo_media.c | 8 --------
osinfo/osinfo_media.h | 7 -------
osinfo/osinfo_media_private.h | 7 -------
osinfo/osinfo_medialist.c | 8 --------
osinfo/osinfo_medialist.h | 7 -------
osinfo/osinfo_os.c | 8 --------
osinfo/osinfo_os.h | 7 -------
osinfo/osinfo_os_variant.c | 7 -------
osinfo/osinfo_os_variant.h | 7 -------
osinfo/osinfo_os_variantlist.c | 8 --------
osinfo/osinfo_os_variantlist.h | 7 -------
osinfo/osinfo_oslist.c | 8 --------
osinfo/osinfo_oslist.h | 7 -------
osinfo/osinfo_platform.c | 7 -------
osinfo/osinfo_platform.h | 7 -------
osinfo/osinfo_platformlist.c | 8 --------
osinfo/osinfo_platformlist.h | 7 -------
osinfo/osinfo_product.c | 8 --------
osinfo/osinfo_product.h | 7 -------
osinfo/osinfo_product_private.h | 8 --------
osinfo/osinfo_productfilter.c | 8 --------
osinfo/osinfo_productfilter.h | 7 -------
osinfo/osinfo_productlist.c | 8 --------
osinfo/osinfo_productlist.h | 7 -------
osinfo/osinfo_resources.c | 8 --------
osinfo/osinfo_resources.h | 7 -------
osinfo/osinfo_resources_private.h | 8 --------
osinfo/osinfo_resourceslist.c | 8 --------
osinfo/osinfo_resourceslist.h | 7 -------
osinfo/osinfo_tree.c | 8 --------
osinfo/osinfo_tree.h | 7 -------
osinfo/osinfo_treelist.c | 8 --------
osinfo/osinfo_treelist.h | 7 -------
tests/test-db.c | 7 -------
tests/test-device.c | 7 -------
tests/test-devicelinklist.c | 7 -------
tests/test-devicelist.c | 7 -------
tests/test-entity.c | 7 -------
tests/test-filter.c | 7 -------
tests/test-image.c | 7 -------
tests/test-imagelist.c | 7 -------
tests/test-imageuris.c | 7 -------
tests/test-install-script.c | 7 -------
tests/test-isodetect.c | 7 -------
tests/test-list.c | 7 -------
tests/test-loader.c | 7 -------
tests/test-media.c | 7 -------
tests/test-mediauris.c | 7 -------
tests/test-os.c | 7 -------
tests/test-oslist.c | 7 -------
tests/test-platform.c | 7 -------
tests/test-platformlist.c | 7 -------
tests/test-product.c | 7 -------
tests/test-productfilter.c | 7 -------
tests/test-treeuris.c | 7 -------
tools/osinfo-detect.c | 8 --------
tools/osinfo-install-script.c | 8 --------
tools/osinfo-query.c | 8 --------
109 files changed, 806 deletions(-)
diff --git a/osinfo/osinfo.h b/osinfo/osinfo.h
index 81c0daf..20a8f3a 100644
--- a/osinfo/osinfo.h
+++ b/osinfo/osinfo.h
@@ -70,10 +70,3 @@
#include
#endif
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_avatar_format.c b/osinfo/osinfo_avatar_format.c
index f3d3dc6..1fe4294 100644
--- a/osinfo/osinfo_avatar_format.c
+++ b/osinfo/osinfo_avatar_format.c
@@ -233,11 +233,3 @@ osinfo_avatar_format_get_alpha(OsinfoAvatarFormat *avatar)
return osinfo_entity_get_param_value_boolean_with_default
(OSINFO_ENTITY(avatar), OSINFO_AVATAR_FORMAT_PROP_ALPHA, TRUE);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_avatar_format.h b/osinfo/osinfo_avatar_format.h
index 0b97b9e..abc9f25 100644
--- a/osinfo/osinfo_avatar_format.h
+++ b/osinfo/osinfo_avatar_format.h
@@ -87,10 +87,3 @@ gint osinfo_avatar_format_get_height(OsinfoAvatarFormat *avatar);
gboolean osinfo_avatar_format_get_alpha(OsinfoAvatarFormat *avatar);
#endif /* __OSINFO_AVATAR_FORMAT_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_datamap.c b/osinfo/osinfo_datamap.c
index beea6e8..05e4631 100644
--- a/osinfo/osinfo_datamap.c
+++ b/osinfo/osinfo_datamap.c
@@ -119,11 +119,3 @@ const gchar *osinfo_datamap_reverse_lookup(OsinfoDatamap *map,
{
return g_hash_table_lookup(map->priv->reverse_map, outval);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_datamap.h b/osinfo/osinfo_datamap.h
index 871d804..3bbfc9d 100644
--- a/osinfo/osinfo_datamap.h
+++ b/osinfo/osinfo_datamap.h
@@ -75,10 +75,3 @@ const gchar *osinfo_datamap_reverse_lookup(OsinfoDatamap *map,
const gchar *outval);
#endif /* __OSINFO_DATAMAP_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_datamaplist.c b/osinfo/osinfo_datamaplist.c
index 6d56d9c..1e45756 100644
--- a/osinfo/osinfo_datamaplist.c
+++ b/osinfo/osinfo_datamaplist.c
@@ -80,11 +80,3 @@ OsinfoDatamapList *osinfo_datamaplist_new(void)
"element-type", OSINFO_TYPE_DATAMAP,
NULL);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_datamaplist.h b/osinfo/osinfo_datamaplist.h
index dc506a1..6a3b91a 100644
--- a/osinfo/osinfo_datamaplist.h
+++ b/osinfo/osinfo_datamaplist.h
@@ -69,10 +69,3 @@ GType osinfo_datamaplist_get_type(void);
OsinfoDatamapList *osinfo_datamaplist_new(void);
#endif /* __OSINFO_DATAMAPLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index f59c804..fa217a2 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -1011,10 +1011,3 @@ OsinfoPlatformList *osinfo_db_unique_values_for_platform_relationship(OsinfoDb *
return newList;
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_db.h b/osinfo/osinfo_db.h
index f2df973..90d7493 100644
--- a/osinfo/osinfo_db.h
+++ b/osinfo/osinfo_db.h
@@ -131,10 +131,3 @@ OsinfoPlatformList *osinfo_db_unique_values_for_platform_relationship(OsinfoDb *
#endif /* __OSINFO_DB_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_deployment.c b/osinfo/osinfo_deployment.c
index a79b32f..4c20e55 100644
--- a/osinfo/osinfo_deployment.c
+++ b/osinfo/osinfo_deployment.c
@@ -373,10 +373,3 @@ OsinfoDeviceLink *osinfo_deployment_add_device(OsinfoDeployment *deployment, Osi
return devlink;
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_deployment.h b/osinfo/osinfo_deployment.h
index 6e2fb5d..5d963d7 100644
--- a/osinfo/osinfo_deployment.h
+++ b/osinfo/osinfo_deployment.h
@@ -82,10 +82,3 @@ OsinfoDeviceLinkList *osinfo_deployment_get_device_links(OsinfoDeployment *deplo
OsinfoDeviceLink *osinfo_deployment_add_device(OsinfoDeployment *deployment, OsinfoDevice *dev);
#endif /* __OSINFO_DEPLOYMENT_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_deploymentlist.c b/osinfo/osinfo_deploymentlist.c
index b50febd..4a78082 100644
--- a/osinfo/osinfo_deploymentlist.c
+++ b/osinfo/osinfo_deploymentlist.c
@@ -162,11 +162,3 @@ OsinfoDeploymentList *osinfo_deploymentlist_new_union(OsinfoDeploymentList *sour
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_deploymentlist.h b/osinfo/osinfo_deploymentlist.h
index c21c8ff..3af9184 100644
--- a/osinfo/osinfo_deploymentlist.h
+++ b/osinfo/osinfo_deploymentlist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoDeploymentList *osinfo_deploymentlist_new_union(OsinfoDeploymentList *sourceOne, OsinfoDeploymentList *sourceTwo);
#endif /* __OSINFO_DEPLOYMENTLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_device.c b/osinfo/osinfo_device.c
index 6389878..6de3d2c 100644
--- a/osinfo/osinfo_device.c
+++ b/osinfo/osinfo_device.c
@@ -120,11 +120,3 @@ const gchar *osinfo_device_get_subsystem(OsinfoDevice *dev)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(dev), OSINFO_DEVICE_PROP_SUBSYSTEM);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_device.h b/osinfo/osinfo_device.h
index 5eb1168..0f26baf 100644
--- a/osinfo/osinfo_device.h
+++ b/osinfo/osinfo_device.h
@@ -89,10 +89,3 @@ const gchar *osinfo_device_get_name(OsinfoDevice *dev);
const gchar *osinfo_device_get_subsystem(OsinfoDevice *dev);
#endif /* __OSINFO_DEVICE_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_device_driver.c b/osinfo/osinfo_device_driver.c
index e9c81ab..dc9ae41 100644
--- a/osinfo/osinfo_device_driver.c
+++ b/osinfo/osinfo_device_driver.c
@@ -185,11 +185,3 @@ gboolean osinfo_device_driver_get_signed(OsinfoDeviceDriver *driver)
(OSINFO_ENTITY(driver),
OSINFO_DEVICE_DRIVER_PROP_SIGNED);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_device_driver.h b/osinfo/osinfo_device_driver.h
index d135226..89a32a6 100644
--- a/osinfo/osinfo_device_driver.h
+++ b/osinfo/osinfo_device_driver.h
@@ -87,10 +87,3 @@ OsinfoDeviceList *osinfo_device_driver_get_devices(OsinfoDeviceDriver *driver);
gboolean osinfo_device_driver_get_signed(OsinfoDeviceDriver *driver);
#endif /* __OSINFO_DEVICE_DRIVER_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_device_driver_private.h b/osinfo/osinfo_device_driver_private.h
index 074ed60..67302c2 100644
--- a/osinfo/osinfo_device_driver_private.h
+++ b/osinfo/osinfo_device_driver_private.h
@@ -31,11 +31,3 @@ void osinfo_device_driver_add_device(OsinfoDeviceDriver *driver,
OsinfoDevice *device);
#endif /* __OSINFO_DEVICE_DRIVER_PRIVATE_H__ */
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_device_driverlist.c b/osinfo/osinfo_device_driverlist.c
index 73c0021..1127709 100644
--- a/osinfo/osinfo_device_driverlist.c
+++ b/osinfo/osinfo_device_driverlist.c
@@ -82,11 +82,3 @@ OsinfoDeviceDriverList *osinfo_device_driverlist_new(void)
"element-type", OSINFO_TYPE_DEVICE_DRIVER,
NULL);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_device_driverlist.h b/osinfo/osinfo_device_driverlist.h
index 5d97e4d..f7563e0 100644
--- a/osinfo/osinfo_device_driverlist.h
+++ b/osinfo/osinfo_device_driverlist.h
@@ -78,10 +78,3 @@ GType osinfo_device_driverlist_get_type(void);
OsinfoDeviceDriverList *osinfo_device_driverlist_new(void);
#endif /* __OSINFO_DEVICE_DRIVERLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelink.c b/osinfo/osinfo_devicelink.c
index 41ebd56..4a8f7f2 100644
--- a/osinfo/osinfo_devicelink.c
+++ b/osinfo/osinfo_devicelink.c
@@ -181,11 +181,3 @@ const gchar *osinfo_devicelink_get_driver(OsinfoDeviceLink *devlink)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(devlink), OSINFO_DEVICELINK_PROP_DRIVER);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelink.h b/osinfo/osinfo_devicelink.h
index 9fe44e1..be3558e 100644
--- a/osinfo/osinfo_devicelink.h
+++ b/osinfo/osinfo_devicelink.h
@@ -76,10 +76,3 @@ OsinfoDevice *osinfo_devicelink_get_target(OsinfoDeviceLink *link);
const gchar *osinfo_devicelink_get_driver(OsinfoDeviceLink *link);
#endif /* __OSINFO_DEVICELINK_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelinkfilter.c b/osinfo/osinfo_devicelinkfilter.c
index 5ecb09b..7657f59 100644
--- a/osinfo/osinfo_devicelinkfilter.c
+++ b/osinfo/osinfo_devicelinkfilter.c
@@ -200,11 +200,3 @@ static gboolean osinfo_devicelinkfilter_matches_default(OsinfoFilter *filter, Os
return TRUE;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelinkfilter.h b/osinfo/osinfo_devicelinkfilter.h
index 7f18185..f85e6b0 100644
--- a/osinfo/osinfo_devicelinkfilter.h
+++ b/osinfo/osinfo_devicelinkfilter.h
@@ -68,10 +68,3 @@ OsinfoDeviceLinkFilter *osinfo_devicelinkfilter_new(OsinfoFilter *filter);
OsinfoFilter *osinfo_devicelinkfilter_get_target_filter(OsinfoDeviceLinkFilter *filter);
#endif /* __OSINFO_DEVICELINKFILTER_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelinklist.c b/osinfo/osinfo_devicelinklist.c
index ccd7d11..2393de1 100644
--- a/osinfo/osinfo_devicelinklist.c
+++ b/osinfo/osinfo_devicelinklist.c
@@ -187,12 +187,3 @@ OsinfoDeviceList *osinfo_devicelinklist_get_devices(OsinfoDeviceLinkList *list,
}
return newList;
}
-
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelinklist.h b/osinfo/osinfo_devicelinklist.h
index 42691b1..7f5aa29 100644
--- a/osinfo/osinfo_devicelinklist.h
+++ b/osinfo/osinfo_devicelinklist.h
@@ -80,10 +80,3 @@ OsinfoDeviceLinkList *osinfo_devicelinklist_new_union(OsinfoDeviceLinkList *sour
OsinfoDeviceList *osinfo_devicelinklist_get_devices(OsinfoDeviceLinkList *list, OsinfoFilter *filter);
#endif /* __OSINFO_DEVICELINKLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelist.c b/osinfo/osinfo_devicelist.c
index fd293b5..2957290 100644
--- a/osinfo/osinfo_devicelist.c
+++ b/osinfo/osinfo_devicelist.c
@@ -162,11 +162,3 @@ OsinfoDeviceList *osinfo_devicelist_new_union(OsinfoDeviceList *sourceOne, Osinf
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_devicelist.h b/osinfo/osinfo_devicelist.h
index 62fec89..ec1bb4a 100644
--- a/osinfo/osinfo_devicelist.h
+++ b/osinfo/osinfo_devicelist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoDeviceList *osinfo_devicelist_new_union(OsinfoDeviceList *sourceOne, OsinfoDeviceList *sourceTwo);
#endif /* __OSINFO_DEVICELIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c
index a776baa..f0bfb67 100644
--- a/osinfo/osinfo_entity.c
+++ b/osinfo/osinfo_entity.c
@@ -418,12 +418,3 @@ GList *osinfo_entity_get_param_value_list(OsinfoEntity *entity, const gchar *key
return g_list_copy(values);
}
-
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_entity.h b/osinfo/osinfo_entity.h
index d41237b..352166d 100644
--- a/osinfo/osinfo_entity.h
+++ b/osinfo/osinfo_entity.h
@@ -92,10 +92,3 @@ void osinfo_entity_add_param(OsinfoEntity *entity, const gchar *key, const gchar
void osinfo_entity_clear_param(OsinfoEntity *entity, const gchar *key);
#endif /* __OSINFO_ENTITY_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_filter.c b/osinfo/osinfo_filter.c
index 1c38735..bc73e91 100644
--- a/osinfo/osinfo_filter.c
+++ b/osinfo/osinfo_filter.c
@@ -280,10 +280,3 @@ gboolean osinfo_filter_matches(OsinfoFilter *filter, OsinfoEntity *entity)
return OSINFO_FILTER_GET_CLASS(filter)->matches(filter, entity);
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_filter.h b/osinfo/osinfo_filter.h
index 14de129..86a9492 100644
--- a/osinfo/osinfo_filter.h
+++ b/osinfo/osinfo_filter.h
@@ -86,10 +86,3 @@ gboolean osinfo_filter_matches(OsinfoFilter *filter,
OsinfoEntity *entity);
#endif /* __OSINFO_FILTER_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_image.c b/osinfo/osinfo_image.c
index 332f19c..31eec76 100644
--- a/osinfo/osinfo_image.c
+++ b/osinfo/osinfo_image.c
@@ -267,11 +267,3 @@ gboolean osinfo_image_get_cloud_init(OsinfoImage *image)
return osinfo_entity_get_param_value_boolean_with_default
(OSINFO_ENTITY(image), OSINFO_IMAGE_PROP_CLOUD_INIT, FALSE);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_image.h b/osinfo/osinfo_image.h
index d9d0818..6dff3e1 100644
--- a/osinfo/osinfo_image.h
+++ b/osinfo/osinfo_image.h
@@ -77,10 +77,3 @@ const gchar *osinfo_image_get_url(OsinfoImage *image);
gboolean osinfo_image_get_cloud_init(OsinfoImage *image);
#endif /* __OSINFO_IMAGE_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_imagelist.c b/osinfo/osinfo_imagelist.c
index 3ebad5a..0187b89 100644
--- a/osinfo/osinfo_imagelist.c
+++ b/osinfo/osinfo_imagelist.c
@@ -80,11 +80,3 @@ OsinfoImageList *osinfo_imagelist_new(void)
"element-type", OSINFO_TYPE_IMAGE,
NULL);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_imagelist.h b/osinfo/osinfo_imagelist.h
index 5050461..cc99428 100644
--- a/osinfo/osinfo_imagelist.h
+++ b/osinfo/osinfo_imagelist.h
@@ -68,10 +68,3 @@ GType osinfo_imagelist_get_type(void);
OsinfoImageList *osinfo_imagelist_new(void);
#endif /* __OSINFO_IMAGELIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index abe37bd..3d183c1 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -687,11 +687,3 @@ gboolean osinfo_install_config_get_driver_signing(OsinfoInstallConfig *config)
OSINFO_INSTALL_CONFIG_PROP_DRIVER_SIGNING,
TRUE);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_config.h b/osinfo/osinfo_install_config.h
index f9db88b..471b91f 100644
--- a/osinfo/osinfo_install_config.h
+++ b/osinfo/osinfo_install_config.h
@@ -200,10 +200,3 @@ void osinfo_install_config_set_driver_signing(OsinfoInstallConfig *config,
gboolean osinfo_install_config_get_driver_signing(OsinfoInstallConfig *config);
#endif /* __OSINFO_INSTALL_CONFIG_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_config_param.c b/osinfo/osinfo_install_config_param.c
index 4adcd07..3b44d3d 100644
--- a/osinfo/osinfo_install_config_param.c
+++ b/osinfo/osinfo_install_config_param.c
@@ -290,11 +290,3 @@ void osinfo_install_config_param_set_value_map(OsinfoInstallConfigParam *config_
g_object_unref(G_OBJECT(config_param->priv->value_map));
config_param->priv->value_map = g_object_ref(datamap);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_config_param.h b/osinfo/osinfo_install_config_param.h
index 8c083f3..047ab06 100644
--- a/osinfo/osinfo_install_config_param.h
+++ b/osinfo/osinfo_install_config_param.h
@@ -94,10 +94,3 @@ OsinfoDatamap *osinfo_install_config_param_get_value_map(OsinfoInstallConfigPara
#endif /* __OSINFO_INSTALL_CONFIG_PARAM_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_config_paramlist.c b/osinfo/osinfo_install_config_paramlist.c
index 060cbdb..9925cbf 100644
--- a/osinfo/osinfo_install_config_paramlist.c
+++ b/osinfo/osinfo_install_config_paramlist.c
@@ -82,11 +82,3 @@ OsinfoInstallConfigParamList *osinfo_install_config_paramlist_new(void)
"element-type", OSINFO_TYPE_INSTALL_CONFIG_PARAM,
NULL);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_config_paramlist.h b/osinfo/osinfo_install_config_paramlist.h
index e27c3ab..6836852 100644
--- a/osinfo/osinfo_install_config_paramlist.h
+++ b/osinfo/osinfo_install_config_paramlist.h
@@ -70,10 +70,3 @@ GType osinfo_install_config_paramlist_get_type(void);
OsinfoInstallConfigParamList *osinfo_install_config_paramlist_new(void);
#endif /* __OSINFO_INSTALL_CONFIG_PARAMLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 19b9354..942197f 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1910,11 +1910,3 @@ osinfo_install_script_get_installation_source(OsinfoInstallScript *script)
OSINFO_TYPE_INSTALL_SCRIPT_INSTALLATION_SOURCE,
OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_MEDIA);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index 3e513e6..c722518 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -271,10 +271,3 @@ void osinfo_install_script_set_installation_source(OsinfoInstallScript *script,
OsinfoInstallScriptInstallationSource osinfo_install_script_get_installation_source(OsinfoInstallScript *script);
#endif /* __OSINFO_INSTALL_SCRIPT_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_script_private.h b/osinfo/osinfo_install_script_private.h
index adf6320..c35466d 100644
--- a/osinfo/osinfo_install_script_private.h
+++ b/osinfo/osinfo_install_script_private.h
@@ -33,10 +33,3 @@ void osinfo_install_script_set_avatar_format(OsinfoInstallScript *script,
OsinfoAvatarFormat *avatar);
#endif /* __OSINFO_INSTALL_SCRIPT_PRIVATE_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_scriptlist.c b/osinfo/osinfo_install_scriptlist.c
index 3146619..26e1f04 100644
--- a/osinfo/osinfo_install_scriptlist.c
+++ b/osinfo/osinfo_install_scriptlist.c
@@ -162,11 +162,3 @@ OsinfoInstallScriptList *osinfo_install_scriptlist_new_union(OsinfoInstallScript
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_install_scriptlist.h b/osinfo/osinfo_install_scriptlist.h
index fba8196..444dc5f 100644
--- a/osinfo/osinfo_install_scriptlist.h
+++ b/osinfo/osinfo_install_scriptlist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoInstallScriptList *osinfo_install_scriptlist_new_union(OsinfoInstallScriptList *sourceOne, OsinfoInstallScriptList *sourceTwo);
#endif /* __OSINFO_INSTALL_SCRIPTLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c
index c829a62..d0f2179 100644
--- a/osinfo/osinfo_list.c
+++ b/osinfo/osinfo_list.c
@@ -488,12 +488,3 @@ OsinfoList *osinfo_list_new_union(OsinfoList *sourceOne,
OSINFO_LIST(sourceTwo));
return newList;
}
-
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_list.h b/osinfo/osinfo_list.h
index bdd9b58..876fe34 100644
--- a/osinfo/osinfo_list.h
+++ b/osinfo/osinfo_list.h
@@ -84,10 +84,3 @@ OsinfoList *osinfo_list_new_intersection(OsinfoList *sourceOne, OsinfoList *sour
OsinfoList *osinfo_list_new_union(OsinfoList *sourceOne, OsinfoList *sourceTwo);
#endif /* __OSINFO_LIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index 95d4424..f71aea9 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -2599,11 +2599,3 @@ void osinfo_loader_process_user_path(OsinfoLoader *loader, GError **err)
osinfo_loader_process_list(loader, dirs, TRUE, err);
g_object_unref(dirs[0]);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_loader.h b/osinfo/osinfo_loader.h
index 76beb7c..dbe37ba 100644
--- a/osinfo/osinfo_loader.h
+++ b/osinfo/osinfo_loader.h
@@ -87,10 +87,3 @@ void osinfo_loader_process_user_path(OsinfoLoader *loader, GError **err);
#endif /* __OSINFO_LOADER_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index efd5794..b16fcf6 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -1715,11 +1715,3 @@ OsinfoInstallScriptList *osinfo_media_get_install_script_list(OsinfoMedia *media
return OSINFO_INSTALL_SCRIPTLIST(new_list);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h
index 3cac587..0c3ee26 100644
--- a/osinfo/osinfo_media.h
+++ b/osinfo/osinfo_media.h
@@ -149,10 +149,3 @@ void osinfo_media_add_install_script(OsinfoMedia *media, OsinfoInstallScript *in
OsinfoInstallScriptList *osinfo_media_get_install_script_list(OsinfoMedia *media);
#endif /* __OSINFO_MEDIA_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_media_private.h b/osinfo/osinfo_media_private.h
index 0c75319..f2a3d55 100644
--- a/osinfo/osinfo_media_private.h
+++ b/osinfo/osinfo_media_private.h
@@ -30,10 +30,3 @@ void osinfo_media_set_languages(OsinfoMedia *media, GList *languages);
void osinfo_media_set_os(OsinfoMedia *media, OsinfoOs *os);
#endif /* __OSINFO_MEDIA_PRIVATE_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_medialist.c b/osinfo/osinfo_medialist.c
index d32ad27..895c5e0 100644
--- a/osinfo/osinfo_medialist.c
+++ b/osinfo/osinfo_medialist.c
@@ -162,11 +162,3 @@ OsinfoMediaList *osinfo_medialist_new_union(OsinfoMediaList *sourceOne,
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_medialist.h b/osinfo/osinfo_medialist.h
index 2782194..47dd2b2 100644
--- a/osinfo/osinfo_medialist.h
+++ b/osinfo/osinfo_medialist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoMediaList *osinfo_medialist_new_union(OsinfoMediaList *sourceOne, OsinfoMediaList *sourceTwo);
#endif /* __OSINFO_MEDIALIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index cb28767..dbea421 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -1140,11 +1140,3 @@ void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver)
osinfo_list_add(OSINFO_LIST(os->priv->device_drivers),
OSINFO_ENTITY(driver));
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h
index cbebd59..7c10475 100644
--- a/osinfo/osinfo_os.h
+++ b/osinfo/osinfo_os.h
@@ -143,10 +143,3 @@ OsinfoDeviceDriverList *osinfo_os_get_device_drivers(OsinfoOs *os);
void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver);
#endif /* __OSINFO_OS_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_os_variant.c b/osinfo/osinfo_os_variant.c
index 914353f..3320209 100644
--- a/osinfo/osinfo_os_variant.c
+++ b/osinfo/osinfo_os_variant.c
@@ -149,10 +149,3 @@ const gchar *osinfo_os_variant_get_name(OsinfoOsVariant *variant)
return osinfo_entity_get_param_value(OSINFO_ENTITY(variant),
OSINFO_OS_VARIANT_PROP_NAME);
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_os_variant.h b/osinfo/osinfo_os_variant.h
index aa857c3..d6083c2 100644
--- a/osinfo/osinfo_os_variant.h
+++ b/osinfo/osinfo_os_variant.h
@@ -72,10 +72,3 @@ OsinfoOsVariant *osinfo_os_variant_new(const gchar *id);
const gchar *osinfo_os_variant_get_name(OsinfoOsVariant *variant);
#endif /* __OSINFO_OS_VARIANT_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_os_variantlist.c b/osinfo/osinfo_os_variantlist.c
index 469c62a..4c8a249 100644
--- a/osinfo/osinfo_os_variantlist.c
+++ b/osinfo/osinfo_os_variantlist.c
@@ -69,11 +69,3 @@ OsinfoOsVariantList *osinfo_os_variantlist_new(void)
"element-type", OSINFO_TYPE_OS_VARIANT,
NULL);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_os_variantlist.h b/osinfo/osinfo_os_variantlist.h
index 243352b..7ce96fd 100644
--- a/osinfo/osinfo_os_variantlist.h
+++ b/osinfo/osinfo_os_variantlist.h
@@ -67,10 +67,3 @@ GType osinfo_os_variantlist_get_type(void);
OsinfoOsVariantList *osinfo_os_variantlist_new(void);
#endif /* __OSINFO_OS_VARIANTLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_oslist.c b/osinfo/osinfo_oslist.c
index 2c9b593..f99e451 100644
--- a/osinfo/osinfo_oslist.c
+++ b/osinfo/osinfo_oslist.c
@@ -161,11 +161,3 @@ OsinfoOsList *osinfo_oslist_new_union(OsinfoOsList *sourceOne, OsinfoOsList *sou
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_oslist.h b/osinfo/osinfo_oslist.h
index 7a18950..365b094 100644
--- a/osinfo/osinfo_oslist.h
+++ b/osinfo/osinfo_oslist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoOsList *osinfo_oslist_new_union(OsinfoOsList *sourceOne, OsinfoOsList *sourceTwo);
#endif /* __OSINFO_OSLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_platform.c b/osinfo/osinfo_platform.c
index c949a83..3864866 100644
--- a/osinfo/osinfo_platform.c
+++ b/osinfo/osinfo_platform.c
@@ -231,10 +231,3 @@ OsinfoDeviceLink *osinfo_platform_add_device(OsinfoPlatform *platform, OsinfoDev
return devlink;
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_platform.h b/osinfo/osinfo_platform.h
index d5df225..d610afd 100644
--- a/osinfo/osinfo_platform.h
+++ b/osinfo/osinfo_platform.h
@@ -77,10 +77,3 @@ OsinfoDeviceLinkList *osinfo_platform_get_device_links(OsinfoPlatform *platform,
OsinfoDeviceLink *osinfo_platform_add_device(OsinfoPlatform *platform, OsinfoDevice *dev);
#endif /* __OSINFO_PLATFORM_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_platformlist.c b/osinfo/osinfo_platformlist.c
index 00990f4..1cfb8fc 100644
--- a/osinfo/osinfo_platformlist.c
+++ b/osinfo/osinfo_platformlist.c
@@ -160,11 +160,3 @@ OsinfoPlatformList *osinfo_platformlist_new_union(OsinfoPlatformList *sourceOne,
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_platformlist.h b/osinfo/osinfo_platformlist.h
index c99f5c0..336a901 100644
--- a/osinfo/osinfo_platformlist.h
+++ b/osinfo/osinfo_platformlist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoPlatformList *osinfo_platformlist_new_union(OsinfoPlatformList *sourceOne, OsinfoPlatformList *sourceTwo);
#endif /* __OSINFO_PLATFORMLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c
index 27cb89c..740785e 100644
--- a/osinfo/osinfo_product.c
+++ b/osinfo/osinfo_product.c
@@ -437,11 +437,3 @@ void osinfo_product_foreach_related(OsinfoProduct *product,
}
g_object_unref(related_list);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_product.h b/osinfo/osinfo_product.h
index b2beebd..611dc6e 100644
--- a/osinfo/osinfo_product.h
+++ b/osinfo/osinfo_product.h
@@ -100,10 +100,3 @@ const gchar *osinfo_product_get_logo(OsinfoProduct *prod);
#endif /* __OSINFO_PRODUCT_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_product_private.h b/osinfo/osinfo_product_private.h
index 49cf0a2..da2750a 100644
--- a/osinfo/osinfo_product_private.h
+++ b/osinfo/osinfo_product_private.h
@@ -41,11 +41,3 @@ void osinfo_product_foreach_related(OsinfoProduct *product,
gpointer user_data);
#endif /* __OSINFO_PRODUCT_PRIVATE_H__ */
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_productfilter.c b/osinfo/osinfo_productfilter.c
index addd3dc..7445500 100644
--- a/osinfo/osinfo_productfilter.c
+++ b/osinfo/osinfo_productfilter.c
@@ -296,11 +296,3 @@ static gboolean osinfo_productfilter_matches_default(OsinfoFilter *filter, Osinf
return args.matched;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_productfilter.h b/osinfo/osinfo_productfilter.h
index 16fd65f..7c57f99 100644
--- a/osinfo/osinfo_productfilter.h
+++ b/osinfo/osinfo_productfilter.h
@@ -74,10 +74,3 @@ GList *osinfo_productfilter_get_product_constraint_values(OsinfoProductFilter *p
void osinfo_productfilter_add_support_date_constraint(OsinfoProductFilter *productfilter, GDate *when);
#endif /* __OSINFO_PRODUCTFILTER_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_productlist.c b/osinfo/osinfo_productlist.c
index 6e29357..7a83262 100644
--- a/osinfo/osinfo_productlist.c
+++ b/osinfo/osinfo_productlist.c
@@ -161,11 +161,3 @@ OsinfoProductList *osinfo_productlist_new_union(OsinfoProductList *sourceOne, Os
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_productlist.h b/osinfo/osinfo_productlist.h
index 8439b7f..6cfa46e 100644
--- a/osinfo/osinfo_productlist.h
+++ b/osinfo/osinfo_productlist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoProductList *osinfo_productlist_new_union(OsinfoProductList *sourceOne, OsinfoProductList *sourceTwo);
#endif /* __OSINFO_PRODUCTLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_resources.c b/osinfo/osinfo_resources.c
index bb39425..4bf9599 100644
--- a/osinfo/osinfo_resources.c
+++ b/osinfo/osinfo_resources.c
@@ -426,11 +426,3 @@ void osinfo_resources_set_inherit(OsinfoResources *resources, gboolean inherit)
resources->priv->inherit = inherit;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_resources.h b/osinfo/osinfo_resources.h
index 2429f5f..67ee885 100644
--- a/osinfo/osinfo_resources.h
+++ b/osinfo/osinfo_resources.h
@@ -99,10 +99,3 @@ void osinfo_resources_set_ram(OsinfoResources *resources, gint64 ram);
void osinfo_resources_set_storage(OsinfoResources *resources, gint64 storage);
#endif /* __OSINFO_RESOURCES_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_resources_private.h b/osinfo/osinfo_resources_private.h
index f1df181..2add8af 100644
--- a/osinfo/osinfo_resources_private.h
+++ b/osinfo/osinfo_resources_private.h
@@ -30,11 +30,3 @@ void osinfo_resources_set_inherit(OsinfoResources *resources, gboolean inherit);
gboolean osinfo_resources_get_inherit(OsinfoResources *resources);
#endif /* __OSINFO_RESOURCES_PRIVATE_H__ */
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_resourceslist.c b/osinfo/osinfo_resourceslist.c
index a9d3737..7971aee 100644
--- a/osinfo/osinfo_resourceslist.c
+++ b/osinfo/osinfo_resourceslist.c
@@ -168,11 +168,3 @@ OsinfoResourcesList *osinfo_resourceslist_new_union
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_resourceslist.h b/osinfo/osinfo_resourceslist.h
index b304e8c..9d8f312 100644
--- a/osinfo/osinfo_resourceslist.h
+++ b/osinfo/osinfo_resourceslist.h
@@ -92,10 +92,3 @@ OsinfoResourcesList *osinfo_resourceslist_new_union
OsinfoResourcesList *sourceTwo);
#endif /* __OSINFO_RESOURCESLIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 65387ee..206b78b 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -885,11 +885,3 @@ gboolean osinfo_tree_has_treeinfo(OsinfoTree *tree)
return osinfo_entity_get_param_value_boolean(OSINFO_ENTITY(tree),
OSINFO_TREE_PROP_HAS_TREEINFO);
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_tree.h b/osinfo/osinfo_tree.h
index 0b19b3b..40a2a29 100644
--- a/osinfo/osinfo_tree.h
+++ b/osinfo/osinfo_tree.h
@@ -112,10 +112,3 @@ const gchar *osinfo_tree_get_initrd_path(OsinfoTree *tree);
/* XXX Xen kernel/initrd paths ? */
#endif /* __OSINFO_TREE_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_treelist.c b/osinfo/osinfo_treelist.c
index 01952f7..9703929 100644
--- a/osinfo/osinfo_treelist.c
+++ b/osinfo/osinfo_treelist.c
@@ -162,11 +162,3 @@ OsinfoTreeList *osinfo_treelist_new_union(OsinfoTreeList *sourceOne,
OSINFO_LIST(sourceTwo));
return newList;
}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/osinfo/osinfo_treelist.h b/osinfo/osinfo_treelist.h
index 3cf8bd4..5ec6819 100644
--- a/osinfo/osinfo_treelist.h
+++ b/osinfo/osinfo_treelist.h
@@ -78,10 +78,3 @@ G_DEPRECATED_FOR(osinfo_list_new_union)
OsinfoTreeList *osinfo_treelist_new_union(OsinfoTreeList *sourceOne, OsinfoTreeList *sourceTwo);
#endif /* __OSINFO_TREELIST_H__ */
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-db.c b/tests/test-db.c
index ffa1001..a0fa490 100644
--- a/tests/test-db.c
+++ b/tests/test-db.c
@@ -483,10 +483,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-device.c b/tests/test-device.c
index 9f70c1b..c4b7673 100644
--- a/tests/test-device.c
+++ b/tests/test-device.c
@@ -48,10 +48,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-devicelinklist.c b/tests/test-devicelinklist.c
index e689057..4230ae7 100644
--- a/tests/test-devicelinklist.c
+++ b/tests/test-devicelinklist.c
@@ -304,10 +304,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-devicelist.c b/tests/test-devicelist.c
index 7df8a69..376c2e3 100644
--- a/tests/test-devicelist.c
+++ b/tests/test-devicelist.c
@@ -219,10 +219,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-entity.c b/tests/test-entity.c
index e65963c..31aa6a9 100644
--- a/tests/test-entity.c
+++ b/tests/test-entity.c
@@ -327,10 +327,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-filter.c b/tests/test-filter.c
index f7c1c90..c11b38b 100644
--- a/tests/test-filter.c
+++ b/tests/test-filter.c
@@ -166,10 +166,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-image.c b/tests/test-image.c
index d029600..2c6e236 100644
--- a/tests/test-image.c
+++ b/tests/test-image.c
@@ -63,10 +63,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-imagelist.c b/tests/test-imagelist.c
index 81d5393..e21c04b 100644
--- a/tests/test-imagelist.c
+++ b/tests/test-imagelist.c
@@ -214,10 +214,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-imageuris.c b/tests/test-imageuris.c
index ca6e648..5a1128c 100644
--- a/tests/test-imageuris.c
+++ b/tests/test-imageuris.c
@@ -81,10 +81,3 @@ main(int argc, char *argv[])
return ret;
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-install-script.c b/tests/test-install-script.c
index 9252423..c63db4c 100644
--- a/tests/test-install-script.c
+++ b/tests/test-install-script.c
@@ -369,10 +369,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index db7b108..144fd12 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -454,10 +454,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-list.c b/tests/test-list.c
index 32e5761..0ed7a24 100644
--- a/tests/test-list.c
+++ b/tests/test-list.c
@@ -409,10 +409,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-loader.c b/tests/test-loader.c
index 9b75d29..f8e369f 100644
--- a/tests/test-loader.c
+++ b/tests/test-loader.c
@@ -58,10 +58,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-media.c b/tests/test-media.c
index 517dd97..7afce22 100644
--- a/tests/test-media.c
+++ b/tests/test-media.c
@@ -159,10 +159,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-mediauris.c b/tests/test-mediauris.c
index c9e09c7..004c5bb 100644
--- a/tests/test-mediauris.c
+++ b/tests/test-mediauris.c
@@ -87,10 +87,3 @@ main(int argc, char *argv[])
return ret;
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-os.c b/tests/test-os.c
index 178bd15..7244c0a 100644
--- a/tests/test-os.c
+++ b/tests/test-os.c
@@ -1021,10 +1021,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-oslist.c b/tests/test-oslist.c
index fc4067f..e8aa239 100644
--- a/tests/test-oslist.c
+++ b/tests/test-oslist.c
@@ -219,10 +219,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-platform.c b/tests/test-platform.c
index 461677c..eaa2c5a 100644
--- a/tests/test-platform.c
+++ b/tests/test-platform.c
@@ -127,10 +127,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-platformlist.c b/tests/test-platformlist.c
index ddf3b9f..84ddef4 100644
--- a/tests/test-platformlist.c
+++ b/tests/test-platformlist.c
@@ -219,10 +219,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-product.c b/tests/test-product.c
index 9310312..6a8e2d6 100644
--- a/tests/test-product.c
+++ b/tests/test-product.c
@@ -204,10 +204,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-productfilter.c b/tests/test-productfilter.c
index f9cc529..6cf7b99 100644
--- a/tests/test-productfilter.c
+++ b/tests/test-productfilter.c
@@ -241,10 +241,3 @@ main(int argc, char *argv[])
return g_test_run();
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tests/test-treeuris.c b/tests/test-treeuris.c
index 48ce82a..50bb8ce 100644
--- a/tests/test-treeuris.c
+++ b/tests/test-treeuris.c
@@ -85,10 +85,3 @@ main(int argc, char *argv[])
return ret;
}
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c
index 9d9831e..a753bfa 100644
--- a/tools/osinfo-detect.c
+++ b/tools/osinfo-detect.c
@@ -355,11 +355,3 @@ FOR A PARTICULAR PURPOSE
=cut
*/
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tools/osinfo-install-script.c b/tools/osinfo-install-script.c
index 81552a4..15af48d 100644
--- a/tools/osinfo-install-script.c
+++ b/tools/osinfo-install-script.c
@@ -547,11 +547,3 @@ FOR A PARTICULAR PURPOSE
=cut
*/
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/tools/osinfo-query.c b/tools/osinfo-query.c
index a75080c..00f838b 100644
--- a/tools/osinfo-query.c
+++ b/tools/osinfo-query.c
@@ -719,11 +719,3 @@ FOR A PARTICULAR PURPOSE
=cut
*/
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-indent-level: 4
- * c-basic-offset: 4
- * End:
- */
--
2.20.1
From ptoscano at redhat.com Mon Mar 4 08:51:27 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Mon, 04 Mar 2019 09:51:27 +0100
Subject: [Libosinfo] [PATCH osinfo-db 1/4] fedora: anchor ambiguous
treeinfo versions
In-Reply-To: <780acaf4f31b9473b224f26da743b3c8fb54fce9.1551473405.git.crobinso@redhat.com>
References:
<780acaf4f31b9473b224f26da743b3c8fb54fce9.1551473405.git.crobinso@redhat.com>
Message-ID: <3864250.H2HbVL5zkR@thyrus.usersys.redhat.com>
On Friday, 1 March 2019 21:54:14 CET Cole Robinson wrote:
> fedora 7/8/9 treeinfo versions regex needs to be anchored, otherwise
> it can match version '29' for example, which it currently does and
> breaks silverblue29 URL detection
>
> Signed-off-by: Cole Robinson
> ---
> data/os/fedoraproject.org/fedora-7.xml.in | 4 ++--
> data/os/fedoraproject.org/fedora-8.xml.in | 4 ++--
> data/os/fedoraproject.org/fedora-9.xml.in | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/data/os/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
> index 03b15ba..8d19955 100644
> --- a/data/os/fedoraproject.org/fedora-7.xml.in
> +++ b/data/os/fedoraproject.org/fedora-7.xml.in
> @@ -98,7 +98,7 @@
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/
>
> Fedora
> - 7
> + ^7$
> i386
>
>
> @@ -106,7 +106,7 @@
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/
>
> Fedora
> - 7
> + ^7$
> x86_64
>
>
> diff --git a/data/os/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
> index 8aae791..77fa573 100644
> --- a/data/os/fedoraproject.org/fedora-8.xml.in
> +++ b/data/os/fedoraproject.org/fedora-8.xml.in
> @@ -110,7 +110,7 @@
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/
>
> Fedora
> - 8
> + ^8$
> i386
>
>
> @@ -118,7 +118,7 @@
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/
>
> Fedora
> - 8
> + ^8$
> x86_64
>
>
> diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
> index fff246d..0c40181 100644
> --- a/data/os/fedoraproject.org/fedora-9.xml.in
> +++ b/data/os/fedoraproject.org/fedora-9.xml.in
> @@ -351,7 +351,7 @@
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/
>
> Fedora
> - 9
> + ^9$
> i386
>
>
> @@ -359,7 +359,7 @@
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/
>
> Fedora
> - 9
> + ^9$
> x86_64
>
>
For the sake of coherency, should not this better done in all the
Fedora versions?
--
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL:
From fidencio at redhat.com Mon Mar 4 09:18:30 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 4 Mar 2019 10:18:30 +0100
Subject: [Libosinfo] [osinfo-db PATCH] ubuntu18.04: Fix initrd path for the
live desktop image
Message-ID: <20190304091830.31716-1-fidencio@redhat.com>
Those are the correct paths for initrd and kernel:
[fidencio at dahmer osinfo-db]$ isoinfo -J -i ~/Downloads/ubuntu-18.04.2-desktop-amd64.iso -f | grep initrd
/casper/initrd
[fidencio at dahmer osinfo-db]$ isoinfo -J -i ~/Downloads/ubuntu-18.04.2-desktop-amd64.iso -f | grep vmlinuz
/casper/vmlinuz
Without those, the unattended installation would fail on Boxes.
Signed-off-by: Fabiano Fid?ncio
---
data/os/ubuntu.com/ubuntu-18.04.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in
index 0e2c428..5d4b8ca 100644
--- a/data/os/ubuntu.com/ubuntu-18.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in
@@ -45,7 +45,7 @@
Ubuntu 18.04(.\d\+?)? LTS amd64
casper/vmlinuz
- casper/initrd.lz
+ casper/initrd
--
2.20.1
From felipe10borges at gmail.com Mon Mar 4 09:21:27 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Mon, 4 Mar 2019 10:21:27 +0100
Subject: [Libosinfo] [osinfo-db PATCH] ubuntu18.04: Fix initrd path for
the live desktop image
In-Reply-To: <20190304091830.31716-1-fidencio@redhat.com>
References: <20190304091830.31716-1-fidencio@redhat.com>
Message-ID:
On Mon, Mar 4, 2019 at 10:18 AM Fabiano Fid?ncio wrote:
>
> Those are the correct paths for initrd and kernel:
> [fidencio at dahmer osinfo-db]$ isoinfo -J -i ~/Downloads/ubuntu-18.04.2-desktop-amd64.iso -f | grep initrd
> /casper/initrd
> [fidencio at dahmer osinfo-db]$ isoinfo -J -i ~/Downloads/ubuntu-18.04.2-desktop-amd64.iso -f | grep vmlinuz
> /casper/vmlinuz
>
> Without those, the unattended installation would fail on Boxes.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> data/os/ubuntu.com/ubuntu-18.04.xml.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in
> index 0e2c428..5d4b8ca 100644
> --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in
I just ran into this and this fixes the express-install for Ubuntu
18.04. Thanks for working on this!
Reviewed-by: Felipe Borges
From berrange at redhat.com Mon Mar 4 10:08:35 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 4 Mar 2019 10:08:35 +0000
Subject: [Libosinfo] [PATCH libosinfo 2/2] Remove emacs 'Local
variables' annotations
In-Reply-To:
References:
Message-ID: <20190304100835.GD4239@redhat.com>
On Sat, Mar 02, 2019 at 06:35:18PM -0500, Cole Robinson wrote:
> No other virt projects have annotations like this, plus IMO
> .editorconfig handles this in a much nicer way and more flexible
> way. Ditch them
.editorconfig requires users to install extra packages to work.
If we want to remove emacs annotations, then we need to have
a .dir-locals.el file defined, so that correct indentation is
used out of the box with emacs.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From fidencio at redhat.com Mon Mar 4 15:24:06 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 4 Mar 2019 16:24:06 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH] spec: Add mingw-json-glib as a
dependency
Message-ID: <20190304152406.21497-1-fidencio@redhat.com>
Since 1.3.0 we depend on json-glib.
Signed-off-by: Fabiano Fid?ncio
---
mingw-osinfo-db-tools.spec.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index d8d7665..486492f 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -22,6 +22,8 @@ BuildRequires: mingw64-binutils
BuildRequires: mingw32-glib2
BuildRequires: mingw64-glib2
+BuildRequires: mingw32-json-glib
+BuildRequires: mingw64-json-glib
BuildRequires: mingw32-libxml2
BuildRequires: mingw64-libxml2
BuildRequires: mingw32-libxslt
--
2.20.1
From crobinso at redhat.com Mon Mar 4 15:37:25 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Mon, 4 Mar 2019 10:37:25 -0500
Subject: [Libosinfo] [osinfo-db-tools PATCH] spec: Add mingw-json-glib
as a dependency
In-Reply-To: <20190304152406.21497-1-fidencio@redhat.com>
References: <20190304152406.21497-1-fidencio@redhat.com>
Message-ID: <77739386-e464-aa1e-1db9-a84de7640d3e@redhat.com>
On 3/4/19 10:24 AM, Fabiano Fid?ncio wrote:
> Since 1.3.0 we depend on json-glib.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> mingw-osinfo-db-tools.spec.in | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
> index d8d7665..486492f 100644
> --- a/mingw-osinfo-db-tools.spec.in
> +++ b/mingw-osinfo-db-tools.spec.in
> @@ -22,6 +22,8 @@ BuildRequires: mingw64-binutils
>
> BuildRequires: mingw32-glib2
> BuildRequires: mingw64-glib2
> +BuildRequires: mingw32-json-glib
> +BuildRequires: mingw64-json-glib
> BuildRequires: mingw32-libxml2
> BuildRequires: mingw64-libxml2
> BuildRequires: mingw32-libxslt
>
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Mon Mar 4 19:11:33 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Mon, 4 Mar 2019 14:11:33 -0500
Subject: [Libosinfo] [PATCH osinfo-db 1/4] fedora: anchor ambiguous
treeinfo versions
In-Reply-To: <3864250.H2HbVL5zkR@thyrus.usersys.redhat.com>
References:
<780acaf4f31b9473b224f26da743b3c8fb54fce9.1551473405.git.crobinso@redhat.com>
<3864250.H2HbVL5zkR@thyrus.usersys.redhat.com>
Message-ID:
On 3/4/19 3:51 AM, Pino Toscano wrote:
> On Friday, 1 March 2019 21:54:14 CET Cole Robinson wrote:
>> fedora 7/8/9 treeinfo versions regex needs to be anchored, otherwise
>> it can match version '29' for example, which it currently does and
>> breaks silverblue29 URL detection
>>
>> Signed-off-by: Cole Robinson
>> ---
>> data/os/fedoraproject.org/fedora-7.xml.in | 4 ++--
>> data/os/fedoraproject.org/fedora-8.xml.in | 4 ++--
>> data/os/fedoraproject.org/fedora-9.xml.in | 4 ++--
>> 3 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/data/os/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
>> index 03b15ba..8d19955 100644
>> --- a/data/os/fedoraproject.org/fedora-7.xml.in
>> +++ b/data/os/fedoraproject.org/fedora-7.xml.in
>> @@ -98,7 +98,7 @@
>> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/
>>
>> Fedora
>> - 7
>> + ^7$
>> i386
>>
>>
>> @@ -106,7 +106,7 @@
>> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/
>>
>> Fedora
>> - 7
>> + ^7$
>> x86_64
>>
>>
>> diff --git a/data/os/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
>> index 8aae791..77fa573 100644
>> --- a/data/os/fedoraproject.org/fedora-8.xml.in
>> +++ b/data/os/fedoraproject.org/fedora-8.xml.in
>> @@ -110,7 +110,7 @@
>> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/
>>
>> Fedora
>> - 8
>> + ^8$
>> i386
>>
>>
>> @@ -118,7 +118,7 @@
>> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/
>>
>> Fedora
>> - 8
>> + ^8$
>> x86_64
>>
>>
>> diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
>> index fff246d..0c40181 100644
>> --- a/data/os/fedoraproject.org/fedora-9.xml.in
>> +++ b/data/os/fedoraproject.org/fedora-9.xml.in
>> @@ -351,7 +351,7 @@
>> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/
>>
>> Fedora
>> - 9
>> + ^9$
>> i386
>>
>>
>> @@ -359,7 +359,7 @@
>> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/
>>
>> Fedora
>> - 9
>> + ^9$
>> x86_64
>>
>>
>
> For the sake of coherency, should not this better done in all the
> Fedora versions?
Probably, but at least in the past some Fedora beta releases would use
version 23_Beta, so there's more cases to consider when applying it
everywhere.
- Cole
From fidencio at redhat.com Tue Mar 5 09:37:48 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:48 +0100
Subject: [Libosinfo] [libosinfo PATCH 0/7] spec files changes
Message-ID: <20190305093755.28934-1-fidencio@redhat.com>
Let's update our specfiles according to some changes already done
downstream (Fedora's dist-git).
The changes that are not on Fedora yet, will be pushed there after those
patches get approved.
Fabiano Fid?ncio (7):
spec: Switch to %ldconfig_scriptlets
spec: Remove needless use of %defattr
mingw,spec: Remove obsolete Group tag
spec: Add "BuildRequires: gcc"
spec: Use standard vala packaging pattern where vapi files are in
-devel
mingw: Use %find_Lang macro
mingw,spec: Fix the Source URL
libosinfo.spec.in | 30 +++++++++++++++++-------------
mingw-libosinfo.spec.in | 13 +++++++------
2 files changed, 24 insertions(+), 19 deletions(-)
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:37:49 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:49 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/7] spec: Switch to
%ldconfig_scriptlets
In-Reply-To: <20190305093755.28934-1-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
Message-ID: <20190305093755.28934-2-fidencio@redhat.com>
This commit is bringing upstream the change done on Fedora on
af0ce7aab60e.
Signed-off-by: Fabiano Fid?ncio
---
libosinfo.spec.in | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index fd7e55c..57f8d94 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -79,12 +79,7 @@ then
exit 1
fi
-%clean
-rm -fr %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files -f %{name}.lang
%defattr(-, root, root)
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:37:50 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:50 +0100
Subject: [Libosinfo] [libosinfo PATCH 2/7] spec: Remove needless use of
%defattr
In-Reply-To: <20190305093755.28934-1-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
Message-ID: <20190305093755.28934-3-fidencio@redhat.com>
This commit is bringing upstream the change done on Fedora on
4a678b2f4d59,
Signed-off-by: Fabiano Fid?ncio
---
libosinfo.spec.in | 3 ---
1 file changed, 3 deletions(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 57f8d94..8dc4d2b 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -82,7 +82,6 @@ fi
%ldconfig_scriptlets
%files -f %{name}.lang
-%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{_bindir}/osinfo-detect
%{_bindir}/osinfo-query
@@ -94,7 +93,6 @@ fi
%{_libdir}/girepository-1.0/Libosinfo-1.0.typelib
%files devel
-%defattr(-, root, root)
%doc examples/demo.js
%doc examples/demo.py
%{_libdir}/%{name}-1.0.so
@@ -106,7 +104,6 @@ fi
%{_datadir}/gtk-doc/html/Libosinfo
%files vala
-%defattr(-, root, root)
%{_datadir}/vala/vapi/libosinfo-1.0.vapi
%changelog
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:37:51 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:51 +0100
Subject: [Libosinfo] [libosinfo PATCH 3/7] mingw,
spec: Remove obsolete Group tag
In-Reply-To: <20190305093755.28934-1-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
Message-ID: <20190305093755.28934-4-fidencio@redhat.com>
This commit brings upstream the changes done on Fedora on
61fea0d48407c0ee,
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
Signed-off-by: Fabiano Fid?ncio
---
libosinfo.spec.in | 3 ---
mingw-libosinfo.spec.in | 1 -
2 files changed, 4 deletions(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 8dc4d2b..648b56e 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -5,7 +5,6 @@ Name: libosinfo
Version: @VERSION@
Release: 1%{?dist}
License: LGPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: https://libosinfo.org/
@@ -31,7 +30,6 @@ combination.
%package devel
Summary: Libraries, includes, etc. to compile with the libosinfo library
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: glib2-devel
@@ -45,7 +43,6 @@ Libraries, includes, etc. to compile with the libosinfo library
%package vala
Summary: Vala bindings
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description vala
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index 35ed983..e99885c 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -5,7 +5,6 @@ Version: @VERSION@
Release: 1%{?dist}
Summary: MinGW Windows port of a library for managing OS information for virtualization
License: LGPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
URL: https://libosinfo.org/
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:37:52 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:52 +0100
Subject: [Libosinfo] [libosinfo PATCH 4/7] spec: Add "BuildRequires: gcc"
In-Reply-To: <20190305093755.28934-1-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
Message-ID: <20190305093755.28934-5-fidencio@redhat.com>
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
Signed-off-by: Fabiano Fid?ncio
---
libosinfo.spec.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 648b56e..6aae7d7 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -8,6 +8,7 @@ License: LGPLv2+
Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: https://libosinfo.org/
+BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:37:53 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:53 +0100
Subject: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging
pattern where vapi files are in -devel
In-Reply-To: <20190305093755.28934-1-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
Message-ID: <20190305093755.28934-6-fidencio@redhat.com>
This commit brings upstream the changes done on Fedora on
42b96ea66d7b3e.
Signed-off-by: Fabiano Fid?ncio
---
libosinfo.spec.in | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 6aae7d7..3cf73ff 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -14,7 +14,9 @@ BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
BuildRequires: libxslt-devel >= 1.0.0
BuildRequires: vala
+%if 0%{?fedora} < 30
BuildRequires: vala-tools
+%endif
BuildRequires: libcurl-devel
BuildRequires: /usr/bin/pod2man
BuildRequires: hwdata
@@ -34,6 +36,11 @@ Summary: Libraries, includes, etc. to compile with the libosinfo library
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: glib2-devel
+%if 0%{?fedora} >= 30
+# -vala subpackage removed in F30
+Obsoletes: libosinfo-vala < 1.3.0-3
+Provides: libosinfo-vala = %{version}-%{release}
+%endif
%description devel
libosinfo is a library that allows virtualization provisioning tools to
@@ -42,6 +49,7 @@ combination.
Libraries, includes, etc. to compile with the libosinfo library
+%if 0%{?fedora} < 30
%package vala
Summary: Vala bindings
Requires: %{name} = %{version}-%{release}
@@ -52,6 +60,7 @@ determine the optimal device settings for a hypervisor/operating system
combination.
This package provides the Vala bindings for libosinfo library.
+%endif
%prep
%setup -q
@@ -101,7 +110,12 @@ fi
%{_datadir}/gir-1.0/Libosinfo-1.0.gir
%{_datadir}/gtk-doc/html/Libosinfo
+%if 0%{?fedora} < 30
%files vala
+%else
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%endif
%{_datadir}/vala/vapi/libosinfo-1.0.vapi
%changelog
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:37:54 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:54 +0100
Subject: [Libosinfo] [libosinfo PATCH 6/7] mingw: Use %find_Lang macro
In-Reply-To: <20190305093755.28934-1-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
Message-ID: <20190305093755.28934-7-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
mingw-libosinfo.spec.in | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index e99885c..14b4c60 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -89,7 +89,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
-%files -n mingw32-libosinfo
+%find_lang osinfo-db-tools
+grep "%{mingw32_datadir}" libosinfo.lang > mingw32-libosinfo.lang
+grep "%{mingw64_datadir}" libosinfo.lang > mingw64-libosinfo.lang
+
+%files -n mingw32-libosinfo -f mingw32-libosinfo.lang
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{mingw32_bindir}/osinfo-detect.exe
%{mingw32_bindir}/osinfo-install-script.exe
@@ -103,9 +107,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%dir %{mingw32_datadir}/libosinfo
%{mingw32_datadir}/libosinfo/usb.ids
%{mingw32_datadir}/libosinfo/pci.ids
-%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
-%files -n mingw64-libosinfo
+%files -n mingw64-libosinfo -f mingw64-libosinfo.lang
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{mingw64_bindir}/osinfo-detect.exe
%{mingw64_bindir}/osinfo-install-script.exe
@@ -119,6 +122,5 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%dir %{mingw64_datadir}/libosinfo
%{mingw64_datadir}/libosinfo/usb.ids
%{mingw64_datadir}/libosinfo/pci.ids
-%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
%changelog
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:37:55 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:37:55 +0100
Subject: [Libosinfo] [libosinfo PATCH 7/7] mingw,spec: Fix the Source URL
In-Reply-To: <20190305093755.28934-1-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
Message-ID: <20190305093755.28934-8-fidencio@redhat.com>
https://releases.pagure.org/libosinfo/... instead of
https://releases.pagure.io/libosinfo/...
Signed-off-by: Fabiano Fid?ncio
---
libosinfo.spec.in | 2 +-
mingw-libosinfo.spec.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 3cf73ff..6a2f2c3 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -5,7 +5,7 @@ Name: libosinfo
Version: @VERSION@
Release: 1%{?dist}
License: LGPLv2+
-Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
+Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: https://libosinfo.org/
BuildRequires: gcc
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index 14b4c60..cfcc04e 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -5,7 +5,7 @@ Version: @VERSION@
Release: 1%{?dist}
Summary: MinGW Windows port of a library for managing OS information for virtualization
License: LGPLv2+
-Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/libosinfo-%{version}.tar.gz
URL: https://libosinfo.org/
BuildArch: noarch
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:39:41 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:39:41 +0100
Subject: [Libosinfo] [osinfo-db PATCH 0/2] spec file changes
Message-ID: <20190305093943.29164-1-fidencio@redhat.com>
Let's update our specfiles according to some changes already done
downstream (Fedora's dist-git).
The changes that are not on Fedora yet, will be pushed there after those
patches get approved.
Fabiano Fid?ncio (2):
spec: Fix the Source URL
spec: Remove obsolete Group tag
osinfo-db.spec.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:39:42 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:39:42 +0100
Subject: [Libosinfo] [osinfo-db PATCH 1/2] spec: Fix the Source URL
In-Reply-To: <20190305093943.29164-1-fidencio@redhat.com>
References: <20190305093943.29164-1-fidencio@redhat.com>
Message-ID: <20190305093943.29164-2-fidencio@redhat.com>
https://releases.pagure.org/libosinfo/... instead of
https://releases.pagure.io/libosinfo/...
Signed-off-by: Fabiano Fid?ncio
---
osinfo-db.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osinfo-db.spec.in b/osinfo-db.spec.in
index 375b2f9..1d6a549 100644
--- a/osinfo-db.spec.in
+++ b/osinfo-db.spec.in
@@ -6,7 +6,7 @@ Version: @VERSION@
Release: 1%{?dist}
License: GPLv2+
Group: Development/Libraries
-Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.xz
+Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
URL: https://libosinfo.org/
BuildRequires: intltool
BuildRequires: osinfo-db-tools
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:39:43 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:39:43 +0100
Subject: [Libosinfo] [osinfo-db PATCH 2/2] spec: Remove obsolete Group tag
In-Reply-To: <20190305093943.29164-1-fidencio@redhat.com>
References: <20190305093943.29164-1-fidencio@redhat.com>
Message-ID: <20190305093943.29164-3-fidencio@redhat.com>
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
Signed-off-by: Fabiano Fid?ncio
---
osinfo-db.spec.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/osinfo-db.spec.in b/osinfo-db.spec.in
index 1d6a549..046be52 100644
--- a/osinfo-db.spec.in
+++ b/osinfo-db.spec.in
@@ -5,7 +5,6 @@ Name: osinfo-db
Version: @VERSION@
Release: 1%{?dist}
License: GPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
URL: https://libosinfo.org/
BuildRequires: intltool
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:42:25 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:42:25 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 0/4] spec files changes
Message-ID: <20190305094229.29519-1-fidencio@redhat.com>
Let's update our specfiles according to some changes already done
downstream (Fedora's dist-git).
The changes that are not on Fedora yet, will be pushed there after those
patches get approved.
Fabiano Fid?ncio (4):
mingw: Use %find_lang macro
spec: Add "BuildRequires: gcc"
mingw,spec: Remove obsolete Group tag
mingw,spec: Fix the Source URL
mingw-osinfo-db-tools.spec.in | 13 +++++++------
osinfo-db-tools.spec.in | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:42:26 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:42:26 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 1/4] mingw: Use %find_lang macro
In-Reply-To: <20190305094229.29519-1-fidencio@redhat.com>
References: <20190305094229.29519-1-fidencio@redhat.com>
Message-ID: <20190305094229.29519-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
mingw-osinfo-db-tools.spec.in | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 486492f..14e275c 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -74,22 +74,24 @@ information about operating systems for use with virtualization
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
-%files -n mingw32-osinfo-db-tools
+%find_lang osinfo-db-tools
+grep "%{mingw32_datadir}" osinfo-db-tools.lang > mingw32-osinfo-db-tools.lang
+grep "%{mingw64_datadir}" osinfo-db-tools.lang > mingw64-osinfo-db-tools.lang
+
+%files -n mingw32-osinfo-db-tools -f mingw32-osinfo-db-tools.lang
%doc AUTHORS ChangeLog NEWS README
%license COPYING
%{mingw32_bindir}/osinfo-db-export.exe
%{mingw32_bindir}/osinfo-db-import.exe
%{mingw32_bindir}/osinfo-db-path.exe
%{mingw32_bindir}/osinfo-db-validate.exe
-%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
-%files -n mingw64-osinfo-db-tools
+%files -n mingw64-osinfo-db-tools -f mingw64-osinfo-db-tools.lang
%doc AUTHORS ChangeLog NEWS README
%license COPYING
%{mingw64_bindir}/osinfo-db-export.exe
%{mingw64_bindir}/osinfo-db-import.exe
%{mingw64_bindir}/osinfo-db-path.exe
%{mingw64_bindir}/osinfo-db-validate.exe
-%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
%changelog
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:42:27 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:42:27 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 2/4] spec: Add "BuildRequires:
gcc"
In-Reply-To: <20190305094229.29519-1-fidencio@redhat.com>
References: <20190305094229.29519-1-fidencio@redhat.com>
Message-ID: <20190305094229.29519-3-fidencio@redhat.com>
This change is bringing upstream the changes done on Fedora on
5195c8b989be.
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
Signed-off-by: Fabiano Fid?ncio
---
osinfo-db-tools.spec.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index e4bbfb2..c1b0659 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -8,6 +8,7 @@ License: GPLv2+
Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
URL: https://libosinfo.org
+BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:42:28 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:42:28 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 3/4] mingw,
spec: Remove obsolete Group tag
In-Reply-To: <20190305094229.29519-1-fidencio@redhat.com>
References: <20190305094229.29519-1-fidencio@redhat.com>
Message-ID: <20190305094229.29519-4-fidencio@redhat.com>
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
Signed-off-by: Fabiano Fid?ncio
---
mingw-osinfo-db-tools.spec.in | 1 -
osinfo-db-tools.spec.in | 1 -
2 files changed, 2 deletions(-)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 14e275c..2724257 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -5,7 +5,6 @@ Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
Summary: MinGW Windows port of a library for managing OS information for virtualization
License: LGPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/osinfo-db-tools-%{version}.tar.gz
URL: https://libosinfo.org
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index c1b0659..7a12e85 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -5,7 +5,6 @@ Name: osinfo-db-tools
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: GPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
URL: https://libosinfo.org
BuildRequires: gcc
--
2.20.1
From fidencio at redhat.com Tue Mar 5 09:42:29 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 10:42:29 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 4/4] mingw,
spec: Fix the Source URL
In-Reply-To: <20190305094229.29519-1-fidencio@redhat.com>
References: <20190305094229.29519-1-fidencio@redhat.com>
Message-ID: <20190305094229.29519-5-fidencio@redhat.com>
https://releases.pagure.org/libosinfo/... instead of
https://releases.pagure.io/libosinfo/...
Signed-off-by: Fabiano Fid?ncio
---
mingw-osinfo-db-tools.spec.in | 2 +-
osinfo-db-tools.spec.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 2724257..96879a3 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -5,7 +5,7 @@ Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
Summary: MinGW Windows port of a library for managing OS information for virtualization
License: LGPLv2+
-Source: https://releases.pagure.io/libosinfo/osinfo-db-tools-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/osinfo-db-tools-%{version}.tar.gz
URL: https://libosinfo.org
BuildArch: noarch
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index 7a12e85..f0a5fcc 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -5,7 +5,7 @@ Name: osinfo-db-tools
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: GPLv2+
-Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.gz
URL: https://libosinfo.org
BuildRequires: gcc
BuildRequires: gettext-devel
--
2.20.1
From ptoscano at redhat.com Tue Mar 5 10:04:13 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 05 Mar 2019 11:04:13 +0100
Subject: [Libosinfo] [osinfo-db PATCH 0/2] spec file changes
In-Reply-To: <20190305093943.29164-1-fidencio@redhat.com>
References: <20190305093943.29164-1-fidencio@redhat.com>
Message-ID: <9092684.6330ufuuC2@thyrus.usersys.redhat.com>
On Tuesday, 5 March 2019 10:39:41 CET Fabiano Fid?ncio wrote:
> Let's update our specfiles according to some changes already done
> downstream (Fedora's dist-git).
>
> The changes that are not on Fedora yet, will be pushed there after those
> patches get approved.
>
> Fabiano Fid?ncio (2):
> spec: Fix the Source URL
> spec: Remove obsolete Group tag
ACK series.
--
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL:
From ptoscano at redhat.com Tue Mar 5 10:04:48 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 05 Mar 2019 11:04:48 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 0/4] spec files changes
In-Reply-To: <20190305094229.29519-1-fidencio@redhat.com>
References: <20190305094229.29519-1-fidencio@redhat.com>
Message-ID: <6565542.ZgiB9AOrfs@thyrus.usersys.redhat.com>
On Tuesday, 5 March 2019 10:42:25 CET Fabiano Fid?ncio wrote:
> Let's update our specfiles according to some changes already done
> downstream (Fedora's dist-git).
>
> The changes that are not on Fedora yet, will be pushed there after those
> patches get approved.
>
> Fabiano Fid?ncio (4):
> mingw: Use %find_lang macro
> spec: Add "BuildRequires: gcc"
> mingw,spec: Remove obsolete Group tag
> mingw,spec: Fix the Source URL
ACK patches #2 to #4.
--
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL:
From fidencio at redhat.com Tue Mar 5 12:22:29 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 13:22:29 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
In-Reply-To:
References:
Message-ID: <075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
> This series adds:
>
> * centos5 entries
> * centos6 data
> * scientificlinux 5.X
> * scientificlinux 6.X
> * scientificlinux 7.X
>
> No iso data is added, just URLs. I'm trying to get osinfo-db to have
> all the treeinfo coverage that virt-install has.
Cole, in the general the series look good (apart from one change that
has to be for "Add scientificlinux-7.X".
There's one thing that I'm interested to know, though:
- Is x.y considered EOL whenever x.(y+1) is released? I mean, will 7.6
be considered EOL whenever 7.7 is released? If so, we'd also have to
add the EOL to the 7.x entries.
Anyways, for patches #1 to #5:
Reviewed-by: Fabiano Fid?ncio
[snip]
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Tue Mar 5 12:25:00 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 13:25:00 +0100
Subject: [Libosinfo] [PATCH osinfo-db 6/6] Add scientificlinux-7.X
In-Reply-To: <4d46373bb9740cbe04ac8f085a2213429095dab3.1551483675.git.crobinso@redhat.com>
References:
<4d46373bb9740cbe04ac8f085a2213429095dab3.1551483675.git.crobinso@redhat.com>
Message-ID: <03a78655d410ddd03c43e460faaeb01591ccff0e.camel@redhat.com>
On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
> Scientific Linux is a RHEL clone, like CentOS. This adds the 7.X
> series.
>
> * Release dates are from here:
> https://www.scientificlinux.org/downloads/sl-versions/sl7/
> * are taken from rhel7 metadata
> * Only x86_64 is available
Cole,
In this series there's a typo in all the "clones id=..." fields.
This fixup should be pushed together with your patches:
fidencio at laerte ~/src/upstream/osinfo-db $ git diff HEAD~1
diff --git a/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
index cc5544b..ea4e456 100644
--- a/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
+++ b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
@@ -9,7 +9,7 @@
linux
scientificlinux
-
+
2014-10-13
diff --git a/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
index 590d72e..b33747c 100644
--- a/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
+++ b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
@@ -9,7 +9,7 @@
linux
scientificlinux
-
+
2015-04-13
diff --git a/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
index ffc1762..26fcd2c 100644
--- a/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
+++ b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
@@ -9,7 +9,7 @@
linux
scientificlinux
-
+
2016-02-05
diff --git a/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
index a55a900..44d4a28 100644
--- a/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
+++ b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
@@ -9,7 +9,7 @@
linux
scientificlinux
-
+
2017-01-25
diff --git a/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
index bc2b147..e14e398 100644
--- a/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
+++ b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
@@ -9,7 +9,7 @@
linux
scientificlinux
-
+
2017-10-02
diff --git a/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
index bb7a267..e3b3134 100644
--- a/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
+++ b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
@@ -9,7 +9,7 @@
linux
scientificlinux
-
+
2018-05-10
diff --git a/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
index 21bf964..c877ffd 100644
--- a/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
+++ b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
@@ -9,7 +9,7 @@
linux
scientificlinux
-
+
2018-12-03
With the fixup:
Reviewed-by: Fabiano Fid?ncio
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Tue Mar 5 12:27:47 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 13:27:47 +0100
Subject: [Libosinfo] [PATCH osinfo-db] data: Remove hard tabs
In-Reply-To: <12eff708d2145c01140de6398a91e9ff460f10f8.1551560934.git.crobinso@redhat.com>
References: <12eff708d2145c01140de6398a91e9ff460f10f8.1551560934.git.crobinso@redhat.com>
Message-ID: <8eb1318e2bff538e593ce51fcab9ce04c15f2e62.camel@redhat.com>
On Sat, 2019-03-02 at 16:09 -0500, Cole Robinson wrote:
> Most XML files are free of hard tabs, but some aren't, and it creates
> weird visual indents in git diffs.
>
> Let's standardize on _not_ using hard tabs
>
> Signed-off-by: Cole Robinson
Reviewed-by: Fabiano Fid?ncio
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Tue Mar 5 12:48:10 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 13:48:10 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
In-Reply-To: <075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
References:
<075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
Message-ID: <937a965c652d1747d91c784ee369b8d0a5306d42.camel@redhat.com>
On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fid?ncio wrote:
> On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
> > This series adds:
> >
> > * centos5 entries
> > * centos6 data
> > * scientificlinux 5.X
> > * scientificlinux 6.X
> > * scientificlinux 7.X
> >
> > No iso data is added, just URLs. I'm trying to get osinfo-db to
> > have
> > all the treeinfo coverage that virt-install has.
>
> Cole, in the general the series look good (apart from one change that
> has to be for "Add scientificlinux-7.X".
>
> There's one thing that I'm interested to know, though:
> - Is x.y considered EOL whenever x.(y+1) is released? I mean, will
> 7.6
> be considered EOL whenever 7.7 is released? If so, we'd also have to
> add the EOL to the 7.x entries.
>
> Anyways, for patches #1 to #5:
> Reviewed-by: Fabiano Fid?ncio
Actually, let me take my "Reviewed-by" back.
Please, take a look at 5cac22bc68[0].
There, the commit message states:
centos: Remove URLs pointing to vault.centos.org
As vault.centos.org doesn't keep any ISO anymore, let's just remove
them from our db.
Along with the URLs removal, let's remove together the tree's as those
can't be accessed without a valid URL.
Removing all the vault.centos.org URLs matches with the recommendation
given by CentOS folks in #centos-devel:
"so in short, if some program links to vault, it's most likely not a
good idea and may not even work"
[0]:
https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108
So, I guess the path to take is to drop #1 and #3.
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Tue Mar 5 12:52:58 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 13:52:58 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
In-Reply-To: <937a965c652d1747d91c784ee369b8d0a5306d42.camel@redhat.com>
References:
<075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
<937a965c652d1747d91c784ee369b8d0a5306d42.camel@redhat.com>
Message-ID:
On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fid?ncio wrote:
> On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fid?ncio wrote:
> > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
> > > This series adds:
> > >
> > > * centos5 entries
> > > * centos6 data
> > > * scientificlinux 5.X
> > > * scientificlinux 6.X
> > > * scientificlinux 7.X
> > >
> > > No iso data is added, just URLs. I'm trying to get osinfo-db to
> > > have
> > > all the treeinfo coverage that virt-install has.
> >
> > Cole, in the general the series look good (apart from one change
> > that
> > has to be for "Add scientificlinux-7.X".
> >
> > There's one thing that I'm interested to know, though:
> > - Is x.y considered EOL whenever x.(y+1) is released? I mean, will
> > 7.6
> > be considered EOL whenever 7.7 is released? If so, we'd also have
> > to
> > add the EOL to the 7.x entries.
> >
> > Anyways, for patches #1 to #5:
> > Reviewed-by: Fabiano Fid?ncio
>
> Actually, let me take my "Reviewed-by" back.
> Please, take a look at 5cac22bc68[0].
>
> There, the commit message states:
> centos: Remove URLs pointing to vault.centos.org
>
> As vault.centos.org doesn't keep any ISO anymore, let's just remove
> them from our db.
>
> Along with the URLs removal, let's remove together the tree's as
> those
> can't be accessed without a valid URL.
>
> Removing all the vault.centos.org URLs matches with the
> recommendation
> given by CentOS folks in #centos-devel:
> "so in short, if some program links to vault, it's most likely not a
> good idea and may not even work"
>
> [0]:
> https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108
>
> So, I guess the path to take is to drop #1 and #3.
Errr, dropping the URLs from #1 and #3, but keeping the tree/treeinfo.
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Tue Mar 5 13:02:27 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 14:02:27 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/4] treeinfo data fixes
In-Reply-To:
References:
Message-ID:
On Fri, 2019-03-01 at 15:54 -0500, Cole Robinson wrote:
> I wrote a script which iterates over the database and pulls out any
> URLs that have associated metadata, then passes
> those
> URLs to osinfo_tree_create_from_location + osinfo_guess_os_from_tree,
> to ensure that we detect the URL as the same OS that it's listed
> with.
> I'll attach the script in a follow up mail.
>
> This series fixes the issues the script discovered.
Although I agree with Pino's comments, I don't think this series should
be blocked till we have all the Fedora versions anchored.
Reviewed-by: Fabiano Fid?ncio
Best Regards,
--
Fabiano Fid?ncio
From cfergeau at redhat.com Tue Mar 5 13:34:51 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:34:51 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 1/4] mingw: Use %find_lang
macro
In-Reply-To: <20190305094229.29519-2-fidencio@redhat.com>
References: <20190305094229.29519-1-fidencio@redhat.com>
<20190305094229.29519-2-fidencio@redhat.com>
Message-ID: <20190305133451.GB5232@natto.ory.fergeau.eu>
On Tue, Mar 05, 2019 at 10:42:26AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> mingw-osinfo-db-tools.spec.in | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
> index 486492f..14e275c 100644
> --- a/mingw-osinfo-db-tools.spec.in
> +++ b/mingw-osinfo-db-tools.spec.in
> @@ -74,22 +74,24 @@ information about operating systems for use with virtualization
> rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
> rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
>
> -%files -n mingw32-osinfo-db-tools
> +%find_lang osinfo-db-tools
> +grep "%{mingw32_datadir}" osinfo-db-tools.lang > mingw32-osinfo-db-tools.lang
> +grep "%{mingw64_datadir}" osinfo-db-tools.lang > mingw64-osinfo-db-tools.lang
Why not %mingw_find_lang ?
> +
> +%files -n mingw32-osinfo-db-tools -f mingw32-osinfo-db-tools.lang
> %doc AUTHORS ChangeLog NEWS README
> %license COPYING
> %{mingw32_bindir}/osinfo-db-export.exe
> %{mingw32_bindir}/osinfo-db-import.exe
> %{mingw32_bindir}/osinfo-db-path.exe
> %{mingw32_bindir}/osinfo-db-validate.exe
> -%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
>
> -%files -n mingw64-osinfo-db-tools
> +%files -n mingw64-osinfo-db-tools -f mingw64-osinfo-db-tools.lang
> %doc AUTHORS ChangeLog NEWS README
> %license COPYING
> %{mingw64_bindir}/osinfo-db-export.exe
> %{mingw64_bindir}/osinfo-db-import.exe
> %{mingw64_bindir}/osinfo-db-path.exe
> %{mingw64_bindir}/osinfo-db-validate.exe
> -%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
>
> %changelog
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:38:55 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:38:55 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 3/4] mingw,
spec: Remove obsolete Group tag
In-Reply-To: <20190305094229.29519-4-fidencio@redhat.com>
References: <20190305094229.29519-1-fidencio@redhat.com>
<20190305094229.29519-4-fidencio@redhat.com>
Message-ID: <20190305133855.GC5232@natto.ory.fergeau.eu>
Acked-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:42:28AM +0100, Fabiano Fid?ncio wrote:
> References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
And ? The Group: tag is not required in any live Fedora or EPEL release.
RHEL5 did need it, but EPEL5 did not as it was supplied automatically
via magic in the epel-rpm-macros package. The Packaging Guidelines have
indicated that the Group: tag should not be used since March of 2017. ?
might be worth quoting in the log.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> mingw-osinfo-db-tools.spec.in | 1 -
> osinfo-db-tools.spec.in | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
> index 14e275c..2724257 100644
> --- a/mingw-osinfo-db-tools.spec.in
> +++ b/mingw-osinfo-db-tools.spec.in
> @@ -5,7 +5,6 @@ Version: @VERSION@
> Release: 1%{?dist}%{?extra_release}
> Summary: MinGW Windows port of a library for managing OS information for virtualization
> License: LGPLv2+
> -Group: Development/Libraries
> Source: https://releases.pagure.io/libosinfo/osinfo-db-tools-%{version}.tar.gz
> URL: https://libosinfo.org
>
> diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
> index c1b0659..7a12e85 100644
> --- a/osinfo-db-tools.spec.in
> +++ b/osinfo-db-tools.spec.in
> @@ -5,7 +5,6 @@ Name: osinfo-db-tools
> Version: @VERSION@
> Release: 1%{?dist}%{?extra_release}
> License: GPLv2+
> -Group: Development/Libraries
> Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
> URL: https://libosinfo.org
> BuildRequires: gcc
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:47:25 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:47:25 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/7] spec: Switch to
%ldconfig_scriptlets
In-Reply-To: <20190305093755.28934-2-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-2-fidencio@redhat.com>
Message-ID: <20190305134725.GD5232@natto.ory.fergeau.eu>
On Tue, Mar 05, 2019 at 10:37:49AM +0100, Fabiano Fid?ncio wrote:
> This commit is bringing upstream the change done on Fedora on
> af0ce7aab60e.
Feature is documented at https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets
I'm not sure el7 will have it, but I don't know what we aim to support
with this spec file.
Reviewed-by: Christophe Fergeau
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> libosinfo.spec.in | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index fd7e55c..57f8d94 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -79,12 +79,7 @@ then
> exit 1
> fi
>
> -%clean
> -rm -fr %{buildroot}
> -
> -%post -p /sbin/ldconfig
> -
> -%postun -p /sbin/ldconfig
> +%ldconfig_scriptlets
>
> %files -f %{name}.lang
> %defattr(-, root, root)
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:48:40 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:48:40 +0100
Subject: [Libosinfo] [libosinfo PATCH 2/7] spec: Remove needless use of
%defattr
In-Reply-To: <20190305093755.28934-3-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-3-fidencio@redhat.com>
Message-ID: <20190305134840.GE5232@natto.ory.fergeau.eu>
Related to https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_permissions
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:50AM +0100, Fabiano Fid?ncio wrote:
> This commit is bringing upstream the change done on Fedora on
> 4a678b2f4d59,
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> libosinfo.spec.in | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 57f8d94..8dc4d2b 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -82,7 +82,6 @@ fi
> %ldconfig_scriptlets
>
> %files -f %{name}.lang
> -%defattr(-, root, root)
> %doc AUTHORS ChangeLog COPYING.LIB NEWS README
> %{_bindir}/osinfo-detect
> %{_bindir}/osinfo-query
> @@ -94,7 +93,6 @@ fi
> %{_libdir}/girepository-1.0/Libosinfo-1.0.typelib
>
> %files devel
> -%defattr(-, root, root)
> %doc examples/demo.js
> %doc examples/demo.py
> %{_libdir}/%{name}-1.0.so
> @@ -106,7 +104,6 @@ fi
> %{_datadir}/gtk-doc/html/Libosinfo
>
> %files vala
> -%defattr(-, root, root)
> %{_datadir}/vala/vapi/libosinfo-1.0.vapi
>
> %changelog
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:48:50 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:48:50 +0100
Subject: [Libosinfo] [libosinfo PATCH 3/7] mingw,
spec: Remove obsolete Group tag
In-Reply-To: <20190305093755.28934-4-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-4-fidencio@redhat.com>
Message-ID: <20190305134850.GF5232@natto.ory.fergeau.eu>
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:51AM +0100, Fabiano Fid?ncio wrote:
> This commit brings upstream the changes done on Fedora on
> 61fea0d48407c0ee,
>
> References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> libosinfo.spec.in | 3 ---
> mingw-libosinfo.spec.in | 1 -
> 2 files changed, 4 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 8dc4d2b..648b56e 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -5,7 +5,6 @@ Name: libosinfo
> Version: @VERSION@
> Release: 1%{?dist}
> License: LGPLv2+
> -Group: Development/Libraries
> Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: https://libosinfo.org/
> @@ -31,7 +30,6 @@ combination.
>
> %package devel
> Summary: Libraries, includes, etc. to compile with the libosinfo library
> -Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
> Requires: pkgconfig
> Requires: glib2-devel
> @@ -45,7 +43,6 @@ Libraries, includes, etc. to compile with the libosinfo library
>
> %package vala
> Summary: Vala bindings
> -Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
>
> %description vala
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index 35ed983..e99885c 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -5,7 +5,6 @@ Version: @VERSION@
> Release: 1%{?dist}
> Summary: MinGW Windows port of a library for managing OS information for virtualization
> License: LGPLv2+
> -Group: Development/Libraries
> Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
> URL: https://libosinfo.org/
>
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:49:03 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:49:03 +0100
Subject: [Libosinfo] [libosinfo PATCH 4/7] spec: Add "BuildRequires: gcc"
In-Reply-To: <20190305093755.28934-5-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-5-fidencio@redhat.com>
Message-ID: <20190305134903.GG5232@natto.ory.fergeau.eu>
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:52AM +0100, Fabiano Fid?ncio wrote:
> Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> libosinfo.spec.in | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 648b56e..6aae7d7 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -8,6 +8,7 @@ License: LGPLv2+
> Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: https://libosinfo.org/
> +BuildRequires: gcc
> BuildRequires: gettext-devel
> BuildRequires: glib2-devel
> BuildRequires: libxml2-devel >= 2.6.0
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:52:28 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:52:28 +0100
Subject: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala
packaging pattern where vapi files are in -devel
In-Reply-To: <20190305093755.28934-6-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-6-fidencio@redhat.com>
Message-ID: <20190305135228.GH5232@natto.ory.fergeau.eu>
I'm not sure I'd make that one conditional on the fedora version. With
the Obsoletes + Provides, upgrades will work fine, so this could be done
on any fedora version.
(I would not have made that change in the first place, but I guess
now is too late ;)
On Tue, Mar 05, 2019 at 10:37:53AM +0100, Fabiano Fid?ncio wrote:
> This commit brings upstream the changes done on Fedora on
> 42b96ea66d7b3e.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> libosinfo.spec.in | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 6aae7d7..3cf73ff 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -14,7 +14,9 @@ BuildRequires: glib2-devel
> BuildRequires: libxml2-devel >= 2.6.0
> BuildRequires: libxslt-devel >= 1.0.0
> BuildRequires: vala
> +%if 0%{?fedora} < 30
> BuildRequires: vala-tools
> +%endif
> BuildRequires: libcurl-devel
> BuildRequires: /usr/bin/pod2man
> BuildRequires: hwdata
> @@ -34,6 +36,11 @@ Summary: Libraries, includes, etc. to compile with the libosinfo library
> Requires: %{name} = %{version}-%{release}
> Requires: pkgconfig
> Requires: glib2-devel
> +%if 0%{?fedora} >= 30
> +# -vala subpackage removed in F30
> +Obsoletes: libosinfo-vala < 1.3.0-3
> +Provides: libosinfo-vala = %{version}-%{release}
> +%endif
>
> %description devel
> libosinfo is a library that allows virtualization provisioning tools to
> @@ -42,6 +49,7 @@ combination.
>
> Libraries, includes, etc. to compile with the libosinfo library
>
> +%if 0%{?fedora} < 30
> %package vala
> Summary: Vala bindings
> Requires: %{name} = %{version}-%{release}
> @@ -52,6 +60,7 @@ determine the optimal device settings for a hypervisor/operating system
> combination.
>
> This package provides the Vala bindings for libosinfo library.
> +%endif
>
> %prep
> %setup -q
> @@ -101,7 +110,12 @@ fi
> %{_datadir}/gir-1.0/Libosinfo-1.0.gir
> %{_datadir}/gtk-doc/html/Libosinfo
>
> +%if 0%{?fedora} < 30
> %files vala
> +%else
> +%dir %{_datadir}/vala
> +%dir %{_datadir}/vala/vapi
> +%endif
> %{_datadir}/vala/vapi/libosinfo-1.0.vapi
>
> %changelog
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:52:48 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:52:48 +0100
Subject: [Libosinfo] [libosinfo PATCH 6/7] mingw: Use %find_Lang macro
In-Reply-To: <20190305093755.28934-7-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-7-fidencio@redhat.com>
Message-ID: <20190305135248.GI5232@natto.ory.fergeau.eu>
On Tue, Mar 05, 2019 at 10:37:54AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> mingw-libosinfo.spec.in | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index e99885c..14b4c60 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -89,7 +89,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
> rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
> rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
>
> -%files -n mingw32-libosinfo
> +%find_lang osinfo-db-tools
> +grep "%{mingw32_datadir}" libosinfo.lang > mingw32-libosinfo.lang
> +grep "%{mingw64_datadir}" libosinfo.lang > mingw64-libosinfo.lang
> +
Probably can be %mingw_find_lang?
> +%files -n mingw32-libosinfo -f mingw32-libosinfo.lang
> %doc AUTHORS ChangeLog COPYING.LIB NEWS README
> %{mingw32_bindir}/osinfo-detect.exe
> %{mingw32_bindir}/osinfo-install-script.exe
> @@ -103,9 +107,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
> %dir %{mingw32_datadir}/libosinfo
> %{mingw32_datadir}/libosinfo/usb.ids
> %{mingw32_datadir}/libosinfo/pci.ids
> -%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
>
> -%files -n mingw64-libosinfo
> +%files -n mingw64-libosinfo -f mingw64-libosinfo.lang
> %doc AUTHORS ChangeLog COPYING.LIB NEWS README
> %{mingw64_bindir}/osinfo-detect.exe
> %{mingw64_bindir}/osinfo-install-script.exe
> @@ -119,6 +122,5 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
> %dir %{mingw64_datadir}/libosinfo
> %{mingw64_datadir}/libosinfo/usb.ids
> %{mingw64_datadir}/libosinfo/pci.ids
> -%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
>
> %changelog
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Tue Mar 5 13:52:54 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 14:52:54 +0100
Subject: [Libosinfo] [libosinfo PATCH 7/7] mingw,
spec: Fix the Source URL
In-Reply-To: <20190305093755.28934-8-fidencio@redhat.com>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-8-fidencio@redhat.com>
Message-ID: <20190305135254.GJ5232@natto.ory.fergeau.eu>
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:55AM +0100, Fabiano Fid?ncio wrote:
> https://releases.pagure.org/libosinfo/... instead of
> https://releases.pagure.io/libosinfo/...
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> libosinfo.spec.in | 2 +-
> mingw-libosinfo.spec.in | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 3cf73ff..6a2f2c3 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -5,7 +5,7 @@ Name: libosinfo
> Version: @VERSION@
> Release: 1%{?dist}
> License: LGPLv2+
> -Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> +Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: https://libosinfo.org/
> BuildRequires: gcc
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index 14b4c60..cfcc04e 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -5,7 +5,7 @@ Version: @VERSION@
> Release: 1%{?dist}
> Summary: MinGW Windows port of a library for managing OS information for virtualization
> License: LGPLv2+
> -Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
> +Source: https://releases.pagure.org/libosinfo/libosinfo-%{version}.tar.gz
> URL: https://libosinfo.org/
>
> BuildArch: noarch
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From fidencio at redhat.com Tue Mar 5 13:58:54 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 14:58:54 +0100
Subject: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala
packaging pattern where vapi files are in -devel
In-Reply-To: <20190305135228.GH5232@natto.ory.fergeau.eu>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-6-fidencio@redhat.com>
<20190305135228.GH5232@natto.ory.fergeau.eu>
Message-ID:
On Tue, 2019-03-05 at 14:52 +0100, Christophe Fergeau wrote:
> I'm not sure I'd make that one conditional on the fedora version.
> With
> the Obsoletes + Provides, upgrades will work fine, so this could be
> done
> on any fedora version.
> (I would not have made that change in the first place, but I guess
> now is too late ;)
The change made on Fedora dist-git doesn't include the conditionals as
it was done only for F30+.
Would you prefer to have the checks completely dropped?
[snip]
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Tue Mar 5 14:01:24 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 15:01:24 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/7] spec: Switch to
%ldconfig_scriptlets
In-Reply-To: <20190305134725.GD5232@natto.ory.fergeau.eu>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-2-fidencio@redhat.com>
<20190305134725.GD5232@natto.ory.fergeau.eu>
Message-ID: <37bafe426c8f6cab3ba67435aab6a3bf68cf1287.camel@redhat.com>
On Tue, 2019-03-05 at 14:47 +0100, Christophe Fergeau wrote:
> On Tue, Mar 05, 2019 at 10:37:49AM +0100, Fabiano Fid?ncio wrote:
> > This commit is bringing upstream the change done on Fedora on
> > af0ce7aab60e.
>
> Feature is documented at
> https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets
> I'm not sure el7 will have it, but I don't know what we aim to
> support
> with this spec file.
So, according to
https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets#Scope
...
"Macroize ldconfig scriptletsf28 + f27 + f26 + epel7 + el6."
I'll give it a try on EL7 anyways and post back the results.
[snip]
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Tue Mar 5 14:03:27 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 15:03:27 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH 1/4] mingw: Use %find_lang
macro
In-Reply-To: <20190305133451.GB5232@natto.ory.fergeau.eu>
References: <20190305094229.29519-1-fidencio@redhat.com>
<20190305094229.29519-2-fidencio@redhat.com>
<20190305133451.GB5232@natto.ory.fergeau.eu>
Message-ID: <0595ccf9db77413690e833ba107d274006300bf7.camel@redhat.com>
On Tue, 2019-03-05 at 14:34 +0100, Christophe Fergeau wrote:
> On Tue, Mar 05, 2019 at 10:42:26AM +0100, Fabiano Fid?ncio wrote:
> > Signed-off-by: Fabiano Fid?ncio
> > ---
> > mingw-osinfo-db-tools.spec.in | 10 ++++++----
> > 1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-
> > tools.spec.in
> > index 486492f..14e275c 100644
> > --- a/mingw-osinfo-db-tools.spec.in
> > +++ b/mingw-osinfo-db-tools.spec.in
> > @@ -74,22 +74,24 @@ information about operating systems for use
> > with virtualization
> > rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
> > rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
> >
> > -%files -n mingw32-osinfo-db-tools
> > +%find_lang osinfo-db-tools
> > +grep "%{mingw32_datadir}" osinfo-db-tools.lang > mingw32-osinfo-
> > db-tools.lang
> > +grep "%{mingw64_datadir}" osinfo-db-tools.lang > mingw64-osinfo-
> > db-tools.lang
>
> Why not %mingw_find_lang ?
Aha, didn't know about that one.
Yesterday, when adding the mingw-osinfo-db-tools package to Fedora, the
suggestion to use %find_lang has been made.
I'll give it a try with %mingw_find_lang then.
[snip]
Best Regards,
--
Fabiano Fid?ncio
From cfergeau at redhat.com Tue Mar 5 14:16:11 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 5 Mar 2019 15:16:11 +0100
Subject: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala
packaging pattern where vapi files are in -devel
In-Reply-To:
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-6-fidencio@redhat.com>
<20190305135228.GH5232@natto.ory.fergeau.eu>
Message-ID: <20190305141611.GK5232@natto.ory.fergeau.eu>
On Tue, Mar 05, 2019 at 02:58:54PM +0100, Fabiano Fid?ncio wrote:
> On Tue, 2019-03-05 at 14:52 +0100, Christophe Fergeau wrote:
> > I'm not sure I'd make that one conditional on the fedora version.
> > With
> > the Obsoletes + Provides, upgrades will work fine, so this could be
> > done
> > on any fedora version.
> > (I would not have made that change in the first place, but I guess
> > now is too late ;)
>
> The change made on Fedora dist-git doesn't include the conditionals as
> it was done only for F30+.
>
> Would you prefer to have the checks completely dropped?
Yes, I don't think it is important that we generate the subpackage on
f29, is it?
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From crobinso at redhat.com Tue Mar 5 14:33:46 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 5 Mar 2019 09:33:46 -0500
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
In-Reply-To:
References:
<075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
<937a965c652d1747d91c784ee369b8d0a5306d42.camel@redhat.com>
Message-ID:
On 3/5/19 7:52 AM, Fabiano Fid?ncio wrote:
> On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fid?ncio wrote:
>> On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fid?ncio wrote:
>>> On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
>>>> This series adds:
>>>>
>>>> * centos5 entries
>>>> * centos6 data
>>>> * scientificlinux 5.X
>>>> * scientificlinux 6.X
>>>> * scientificlinux 7.X
>>>>
>>>> No iso data is added, just URLs. I'm trying to get osinfo-db to
>>>> have
>>>> all the treeinfo coverage that virt-install has.
>>>
>>> Cole, in the general the series look good (apart from one change
>>> that
>>> has to be for "Add scientificlinux-7.X".
>>>
>>> There's one thing that I'm interested to know, though:
>>> - Is x.y considered EOL whenever x.(y+1) is released? I mean, will
>>> 7.6
>>> be considered EOL whenever 7.7 is released? If so, we'd also have
>>> to
>>> add the EOL to the 7.x entries.
>>>
>>> Anyways, for patches #1 to #5:
>>> Reviewed-by: Fabiano Fid?ncio
>>
>> Actually, let me take my "Reviewed-by" back.
>> Please, take a look at 5cac22bc68[0].
>>
>> There, the commit message states:
>> centos: Remove URLs pointing to vault.centos.org
>>
>> As vault.centos.org doesn't keep any ISO anymore, let's just remove
>> them from our db.
>>
>> Along with the URLs removal, let's remove together the tree's as
>> those
>> can't be accessed without a valid URL.
>>
>> Removing all the vault.centos.org URLs matches with the
>> recommendation
>> given by CentOS folks in #centos-devel:
>> "so in short, if some program links to vault, it's most likely not a
>> good idea and may not even work"
>>
>> [0]:
>> https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108
>>
>> So, I guess the path to take is to drop #1 and #3.
>
> Errr, dropping the URLs from #1 and #3, but keeping the tree/treeinfo.
>
ACK from me, though what was centos reasoning for not pointing to
vault.centos.org tree URLs? Those have been stable for years in my
experience. I can understand if they don't want those advertised but
it's unclear why the comment suggests it might not work
- Cole
From crobinso at redhat.com Tue Mar 5 14:34:14 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 5 Mar 2019 09:34:14 -0500
Subject: [Libosinfo] [PATCH osinfo-db 6/6] Add scientificlinux-7.X
In-Reply-To: <03a78655d410ddd03c43e460faaeb01591ccff0e.camel@redhat.com>
References:
<4d46373bb9740cbe04ac8f085a2213429095dab3.1551483675.git.crobinso@redhat.com>
<03a78655d410ddd03c43e460faaeb01591ccff0e.camel@redhat.com>
Message-ID:
On 3/5/19 7:25 AM, Fabiano Fid?ncio wrote:
> On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
>> Scientific Linux is a RHEL clone, like CentOS. This adds the 7.X
>> series.
>>
>> * Release dates are from here:
>> https://www.scientificlinux.org/downloads/sl-versions/sl7/
>> * are taken from rhel7 metadata
>> * Only x86_64 is available
>
> Cole,
>
> In this series there's a typo in all the "clones id=..." fields.
>
> This fixup should be pushed together with your patches:
> fidencio at laerte ~/src/upstream/osinfo-db $ git diff HEAD~1
> diff --git a/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
> b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
> index cc5544b..ea4e456 100644
> --- a/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
> +++ b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in
> @@ -9,7 +9,7 @@
> linux
> scientificlinux
>
> -
> +
>
> 2014-10-13
>
> diff --git a/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
> b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
> index 590d72e..b33747c 100644
> --- a/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
> +++ b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in
> @@ -9,7 +9,7 @@
> linux
> scientificlinux
>
> -
> +
>
> 2015-04-13
>
> diff --git a/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
> b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
> index ffc1762..26fcd2c 100644
> --- a/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
> +++ b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in
> @@ -9,7 +9,7 @@
> linux
> scientificlinux
>
> -
> +
>
> 2016-02-05
>
> diff --git a/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
> b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
> index a55a900..44d4a28 100644
> --- a/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
> +++ b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in
> @@ -9,7 +9,7 @@
> linux
> scientificlinux
>
> -
> +
>
> 2017-01-25
>
> diff --git a/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
> b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
> index bc2b147..e14e398 100644
> --- a/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
> +++ b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in
> @@ -9,7 +9,7 @@
> linux
> scientificlinux
>
> -
> +
>
> 2017-10-02
>
> diff --git a/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
> b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
> index bb7a267..e3b3134 100644
> --- a/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
> +++ b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in
> @@ -9,7 +9,7 @@
> linux
> scientificlinux
>
> -
> +
>
> 2018-05-10
>
> diff --git a/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
> b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
> index 21bf964..c877ffd 100644
> --- a/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
> +++ b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in
> @@ -9,7 +9,7 @@
> linux
> scientificlinux
>
> -
> +
>
> 2018-12-03
>
> With the fixup:
> Reviewed-by: Fabiano Fid?ncio
>
Good catch, I screwed up the regex there. ACK
Thanks,
Cole
From fidencio at redhat.com Tue Mar 5 15:31:53 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 16:31:53 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
In-Reply-To:
References:
<075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
<937a965c652d1747d91c784ee369b8d0a5306d42.camel@redhat.com>
Message-ID: <5d22c05d943600c76896369d6240e49c10ca7c49.camel@redhat.com>
On Tue, 2019-03-05 at 09:33 -0500, Cole Robinson wrote:
> On 3/5/19 7:52 AM, Fabiano Fid?ncio wrote:
> > On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fid?ncio wrote:
> > > On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fid?ncio wrote:
> > > > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
> > > > > This series adds:
> > > > >
> > > > > * centos5 entries
> > > > > * centos6 data
> > > > > * scientificlinux 5.X
> > > > > * scientificlinux 6.X
> > > > > * scientificlinux 7.X
> > > > >
> > > > > No iso data is added, just URLs. I'm trying to get osinfo-db
> > > > > to
> > > > > have
> > > > > all the treeinfo coverage that virt-install has.
> > > >
> > > > Cole, in the general the series look good (apart from one
> > > > change
> > > > that
> > > > has to be for "Add scientificlinux-7.X".
> > > >
> > > > There's one thing that I'm interested to know, though:
> > > > - Is x.y considered EOL whenever x.(y+1) is released? I mean,
> > > > will
> > > > 7.6
> > > > be considered EOL whenever 7.7 is released? If so, we'd also
> > > > have
> > > > to
> > > > add the EOL to the 7.x entries.
> > > >
> > > > Anyways, for patches #1 to #5:
> > > > Reviewed-by: Fabiano Fid?ncio
> > >
> > > Actually, let me take my "Reviewed-by" back.
> > > Please, take a look at 5cac22bc68[0].
> > >
> > > There, the commit message states:
> > > centos: Remove URLs pointing to vault.centos.org
> > >
> > > As vault.centos.org doesn't keep any ISO anymore, let's just
> > > remove
> > > them from our db.
> > >
> > > Along with the URLs removal, let's remove together the tree's as
> > > those
> > > can't be accessed without a valid URL.
> > >
> > > Removing all the vault.centos.org URLs matches with the
> > > recommendation
> > > given by CentOS folks in #centos-devel:
> > > "so in short, if some program links to vault, it's most likely
> > > not a
> > > good idea and may not even work"
> > >
> > > [0]:
> > > https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108
> > >
> > > So, I guess the path to take is to drop #1 and #3.
> >
> > Errr, dropping the URLs from #1 and #3, but keeping the
> > tree/treeinfo.
> >
>
> ACK from me, though what was centos reasoning for not pointing to
> vault.centos.org tree URLs? Those have been stable for years in my
> experience. I can understand if they don't want those advertised but
> it's unclear why the comment suggests it might not work
So, the whole conversation I had on #centos-devel was more about link
to their medias than the tree itself, but let me try to summarise
everything there:
I've contacted #centos-devel because the EOL medias are always removed
from vault, in a way that the links would automatically redirect to
http://vault.centos.org/notonvault.html ... This is expected as a
CentOS release becomes unsupported shortly after a new release comes
out.
The trees follow pretty much the same process as the one followed by
the ISOs. So, for instance, while we have a valid tree for 6.10 (
http://mirror.centos.org/centos/6.10/os/x86_64), the tree for 6.9 is
not valid anymore. Trying to access
http://mirror.centos.org/centos/6.9/os/x86_64/ you'd get a 404 and
http://mirror.centos.org/centos/6.9/ has one single file mentioning
that the system has reached its EOL:
http://mirror.centos.org/centos/6.9/readme
Apart from that, I've also faced some issues where we'd have the tree
but only with the sources but not with the packages. When I asked about
that, the aswer that I got was that apps should not be relying on
vault.
One thing that we can do is to:
- Always add the URL for the current supported release;
- Remove the URL as soon as the new release is done;
What do you think?
Best Regards,
--
Fabiano Fid?ncio
From crobinso at redhat.com Tue Mar 5 15:43:07 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 5 Mar 2019 10:43:07 -0500
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
In-Reply-To: <5d22c05d943600c76896369d6240e49c10ca7c49.camel@redhat.com>
References:
<075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
<937a965c652d1747d91c784ee369b8d0a5306d42.camel@redhat.com>
<5d22c05d943600c76896369d6240e49c10ca7c49.camel@redhat.com>
Message-ID: <5804c28f-1fae-9a03-187a-bfb96cff7f97@redhat.com>
On 3/5/19 10:31 AM, Fabiano Fid?ncio wrote:
> On Tue, 2019-03-05 at 09:33 -0500, Cole Robinson wrote:
>> On 3/5/19 7:52 AM, Fabiano Fid?ncio wrote:
>>> On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fid?ncio wrote:
>>>> On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fid?ncio wrote:
>>>>> On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
>>>>>> This series adds:
>>>>>>
>>>>>> * centos5 entries
>>>>>> * centos6 data
>>>>>> * scientificlinux 5.X
>>>>>> * scientificlinux 6.X
>>>>>> * scientificlinux 7.X
>>>>>>
>>>>>> No iso data is added, just URLs. I'm trying to get osinfo-db
>>>>>> to
>>>>>> have
>>>>>> all the treeinfo coverage that virt-install has.
>>>>>
>>>>> Cole, in the general the series look good (apart from one
>>>>> change
>>>>> that
>>>>> has to be for "Add scientificlinux-7.X".
>>>>>
>>>>> There's one thing that I'm interested to know, though:
>>>>> - Is x.y considered EOL whenever x.(y+1) is released? I mean,
>>>>> will
>>>>> 7.6
>>>>> be considered EOL whenever 7.7 is released? If so, we'd also
>>>>> have
>>>>> to
>>>>> add the EOL to the 7.x entries.
>>>>>
>>>>> Anyways, for patches #1 to #5:
>>>>> Reviewed-by: Fabiano Fid?ncio
>>>>
>>>> Actually, let me take my "Reviewed-by" back.
>>>> Please, take a look at 5cac22bc68[0].
>>>>
>>>> There, the commit message states:
>>>> centos: Remove URLs pointing to vault.centos.org
>>>>
>>>> As vault.centos.org doesn't keep any ISO anymore, let's just
>>>> remove
>>>> them from our db.
>>>>
>>>> Along with the URLs removal, let's remove together the tree's as
>>>> those
>>>> can't be accessed without a valid URL.
>>>>
>>>> Removing all the vault.centos.org URLs matches with the
>>>> recommendation
>>>> given by CentOS folks in #centos-devel:
>>>> "so in short, if some program links to vault, it's most likely
>>>> not a
>>>> good idea and may not even work"
>>>>
>>>> [0]:
>>>> https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108
>>>>
>>>> So, I guess the path to take is to drop #1 and #3.
>>>
>>> Errr, dropping the URLs from #1 and #3, but keeping the
>>> tree/treeinfo.
>>>
>>
>> ACK from me, though what was centos reasoning for not pointing to
>> vault.centos.org tree URLs? Those have been stable for years in my
>> experience. I can understand if they don't want those advertised but
>> it's unclear why the comment suggests it might not work
>
> So, the whole conversation I had on #centos-devel was more about link
> to their medias than the tree itself, but let me try to summarise
> everything there:
>
> I've contacted #centos-devel because the EOL medias are always removed
> from vault, in a way that the links would automatically redirect to
> http://vault.centos.org/notonvault.html ... This is expected as a
> CentOS release becomes unsupported shortly after a new release comes
> out.
>
> The trees follow pretty much the same process as the one followed by
> the ISOs. So, for instance, while we have a valid tree for 6.10 (
> http://mirror.centos.org/centos/6.10/os/x86_64), the tree for 6.9 is
> not valid anymore. Trying to access
> http://mirror.centos.org/centos/6.9/os/x86_64/ you'd get a 404 and
> http://mirror.centos.org/centos/6.9/ has one single file mentioning
> that the system has reached its EOL:
> http://mirror.centos.org/centos/6.9/readme
>
> Apart from that, I've also faced some issues where we'd have the tree
> but only with the sources but not with the packages. When I asked about
> that, the aswer that I got was that apps should not be relying on
> vault.
>
Hmm I haven't seen that 'sources' issue but I guess if centos folks say
'dont use vault.centos.org' then we should listen to them.
> One thing that we can do is to:
> - Always add the URL for the current supported release;
> - Remove the URL as soon as the new release is done;
>
Makes sense to me
- Cole
From fidencio at redhat.com Tue Mar 5 16:28:35 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 05 Mar 2019 17:28:35 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
In-Reply-To: <5804c28f-1fae-9a03-187a-bfb96cff7f97@redhat.com>
References:
<075229d15fc6eea7764076d81f9982049c8dea35.camel@redhat.com>
<937a965c652d1747d91c784ee369b8d0a5306d42.camel@redhat.com>
<5d22c05d943600c76896369d6240e49c10ca7c49.camel@redhat.com>
<5804c28f-1fae-9a03-187a-bfb96cff7f97@redhat.com>
Message-ID: <70d25000c40efa6ae772414a958253f95294c48f.camel@redhat.com>
On Tue, 2019-03-05 at 10:43 -0500, Cole Robinson wrote:
> On 3/5/19 10:31 AM, Fabiano Fid?ncio wrote:
> > On Tue, 2019-03-05 at 09:33 -0500, Cole Robinson wrote:
> > > On 3/5/19 7:52 AM, Fabiano Fid?ncio wrote:
> > > > On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fid?ncio wrote:
> > > > > On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fid?ncio wrote:
> > > > > > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote:
> > > > > > > This series adds:
> > > > > > >
> > > > > > > * centos5 entries
> > > > > > > * centos6 data
> > > > > > > * scientificlinux 5.X
> > > > > > > * scientificlinux 6.X
> > > > > > > * scientificlinux 7.X
> > > > > > >
> > > > > > > No iso data is added, just URLs. I'm trying to get
> > > > > > > osinfo-db
> > > > > > > to
> > > > > > > have
> > > > > > > all the treeinfo coverage that virt-install has.
> > > > > >
> > > > > > Cole, in the general the series look good (apart from one
> > > > > > change
> > > > > > that
> > > > > > has to be for "Add scientificlinux-7.X".
> > > > > >
> > > > > > There's one thing that I'm interested to know, though:
> > > > > > - Is x.y considered EOL whenever x.(y+1) is released? I
> > > > > > mean,
> > > > > > will
> > > > > > 7.6
> > > > > > be considered EOL whenever 7.7 is released? If so, we'd
> > > > > > also
> > > > > > have
> > > > > > to
> > > > > > add the EOL to the 7.x entries.
> > > > > >
> > > > > > Anyways, for patches #1 to #5:
> > > > > > Reviewed-by: Fabiano Fid?ncio
> > > > >
> > > > > Actually, let me take my "Reviewed-by" back.
> > > > > Please, take a look at 5cac22bc68[0].
> > > > >
> > > > > There, the commit message states:
> > > > > centos: Remove URLs pointing to vault.centos.org
> > > > >
> > > > > As vault.centos.org doesn't keep any ISO anymore, let's just
> > > > > remove
> > > > > them from our db.
> > > > >
> > > > > Along with the URLs removal, let's remove together the tree's
> > > > > as
> > > > > those
> > > > > can't be accessed without a valid URL.
> > > > >
> > > > > Removing all the vault.centos.org URLs matches with the
> > > > > recommendation
> > > > > given by CentOS folks in #centos-devel:
> > > > > "so in short, if some program links to vault, it's most
> > > > > likely
> > > > > not a
> > > > > good idea and may not even work"
> > > > >
> > > > > [0]:
> > > > > https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108
> > > > >
> > > > > So, I guess the path to take is to drop #1 and #3.
> > > >
> > > > Errr, dropping the URLs from #1 and #3, but keeping the
> > > > tree/treeinfo.
> > > >
> > >
> > > ACK from me, though what was centos reasoning for not pointing to
> > > vault.centos.org tree URLs? Those have been stable for years in
> > > my
> > > experience. I can understand if they don't want those advertised
> > > but
> > > it's unclear why the comment suggests it might not work
> >
> > So, the whole conversation I had on #centos-devel was more about
> > link
> > to their medias than the tree itself, but let me try to summarise
> > everything there:
> >
> > I've contacted #centos-devel because the EOL medias are always
> > removed
> > from vault, in a way that the links would automatically redirect
> > to
> > http://vault.centos.org/notonvault.html ... This is expected as a
> > CentOS release becomes unsupported shortly after a new release
> > comes
> > out.
> >
> > The trees follow pretty much the same process as the one followed
> > by
> > the ISOs. So, for instance, while we have a valid tree for 6.10 (
> > http://mirror.centos.org/centos/6.10/os/x86_64), the tree for 6.9
> > is
> > not valid anymore. Trying to access
> > http://mirror.centos.org/centos/6.9/os/x86_64/ you'd get a 404 and
> > http://mirror.centos.org/centos/6.9/ has one single file mentioning
> > that the system has reached its EOL:
> > http://mirror.centos.org/centos/6.9/readme
> >
> > Apart from that, I've also faced some issues where we'd have the
> > tree
> > but only with the sources but not with the packages. When I asked
> > about
> > that, the aswer that I got was that apps should not be relying on
> > vault.
> >
>
> Hmm I haven't seen that 'sources' issue but I guess if centos folks
> say
> 'dont use vault.centos.org' then we should listen to them.
>
> > One thing that we can do is to:
> > - Always add the URL for the current supported release;
> > - Remove the URL as soon as the new release is done;
> >
> Makes sense to me
About our own soap-opera here ... I'll go with the Patches #1 and #3 as
they were submitted.
>
> - Cole
From fabiano at fidencio.org Tue Mar 5 19:03:38 2019
From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 20:03:38 +0100
Subject: [Libosinfo] [osinfo-db PATCH] centos7: Add CentOS 7 entry
Message-ID: <1551812618-22189-1-git-send-email-fabiano@fidencio.org>
"centos7" is the preferred way to display and advertise CentOS 7, mainly
because CentOS does not support pointing releases at all.
After talking with Jim Perrin, a CentOS board member, we've decided that
the change from centos7.0 to centos7 would be the way to go.
As we can't break backward compatibility, we can't just rename
centos-7.0.xml.in to centos-7.xml.in and adjust the bits accordingly.
Knowing that, the path to take is creating a new centos-7.xml.in entry
that contains exactly the same content of centos-7.0.xml.in, adjust the
bits in the new entry and change centos-7.0 to "clone" centos-7.
Although this is not the most elegant solution, it ensures we properly
advertise CentOS in the way its community wants and also do not break
backward compatibility.
Signed-off-by: Fabiano Fid?ncio
---
data/os/centos.org/centos-7.0.xml.in | 4 +-
data/os/centos.org/centos-7.xml.in | 86 ++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 1 deletion(-)
create mode 100644 data/os/centos.org/centos-7.xml.in
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index 7fc6d8d..bbfeb48 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -1,6 +1,8 @@
+
+
centos7.0
<_name>CentOS 7.0
@@ -9,7 +11,7 @@
linux
centos
-
+
2014-07-07
diff --git a/data/os/centos.org/centos-7.xml.in b/data/os/centos.org/centos-7.xml.in
new file mode 100644
index 0000000..382bbc6
--- /dev/null
+++ b/data/os/centos.org/centos-7.xml.in
@@ -0,0 +1,86 @@
+
+
+
+
+
+ centos7
+ <_name>CentOS 7
+ 7
+ <_vendor>CentOS
+ linux
+ centos
+
+
+
+ 2014-07-07
+
+
+ <_name>CentOS 7 (GNOME)
+
+
+ <_name>CentOS 7 (KDE)
+
+
+
+ https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD.iso
+
+ LINUX
+ CentOS 7 x86_64
+
+ isolinux/vmlinuz
+ isolinux/initrd.img
+
+
+
+
+ https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso
+
+ LINUX
+ CentOS-7-x86_64-LiveGNOME*
+
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
+
+
+
+
+ https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveKDE.iso
+
+ LINUX
+ CentOS-7-x86_64-LiveKDE*
+
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
+
+
+
+ http://mirror.centos.org/centos-7/7/os/x86_64/
+
+ CentOS
+ ^7$
+ x86_64
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+
+
+
+
+
+
--
1.8.3.1
From fabiano at fidencio.org Tue Mar 5 21:14:59 2019
From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 22:14:59 +0100
Subject: [Libosinfo] [osinfo-db PATCH 1/4] haiku-nightly: Update volume-id
In-Reply-To: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
References: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
Message-ID: <1551820502-21238-2-git-send-email-fabiano@fidencio.org>
After some back and forth with haiku community, we've fixed Haiku's
volume-id for nightly and new versions.
Signed-off-by: Fabiano Fid?ncio
---
data/os/haiku-os.org/haiku-nightly.xml.in | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/data/os/haiku-os.org/haiku-nightly.xml.in b/data/os/haiku-os.org/haiku-nightly.xml.in
index 4dfd660..f385a57 100644
--- a/data/os/haiku-os.org/haiku-nightly.xml.in
+++ b/data/os/haiku-os.org/haiku-nightly.xml.in
@@ -16,8 +16,13 @@
- bootimg
- LINUX
+ haiku-nightly-x86
+
+
+
+
+
+ haiku-nightly-x86_64
--
1.8.3.1
From fabiano at fidencio.org Tue Mar 5 21:14:58 2019
From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 22:14:58 +0100
Subject: [Libosinfo] [osinfo-db PATCH 0/4] Update haiku entries
Message-ID: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
Let's update haiku-nightly to match the volume-id of the ISOs being
currently generated.
Unfortunately, their infra to generate the ISOs was a bit messy in the
past, which caused some nightly ISOs to be generated with the same
volume-id as the R1Beta1 release.
I've decided to just leave the R1Beta1 with that volume-id (as it is an
official release) and convinced Haiku developers to change the volume-id
for the nightly ones.
This patchset ends up updating the volume-id for the nightly to match the
change on their infra and adding a R1Beta1 entry, allowing us to close
https://gitlab.com/libosinfo/osinfo-db/issues/18
osinfo-db:
Fabiano Fid?ncio (2):
haiku-nightly: Update volume-id
haikur1beta1: Add info
data/os/haiku-os.org/haiku-nightly.xml.in | 9 +++++--
data/os/haiku-os.org/haiku-r1beta1.xml.in | 44 +++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 2 deletions(-)
create mode 100644 data/os/haiku-os.org/haiku-r1beta1.xml.in
libosinfo:
Fabiano Fid?ncio (2):
haikunightly: Update test data
haikur1beta1: Add tests data
.../haikunightly/haiku-nightly-anyboot-x86.iso.txt | 29 ++++++++++++++++++++++
.../haiku-nightly-anyboot-x86_64.iso.txt | 29 ++++++++++++++++++++++
.../haikunightly/haiku-nightly-anyboot.iso.txt | 29 ----------------------
.../haikur1beta1/haiku-release-anyboot-x86.iso.txt | 29 ++++++++++++++++++++++
.../haiku-release-anyboot-x86_64.iso.txt | 29 ++++++++++++++++++++++
5 files changed, 116 insertions(+), 29 deletions(-)
create mode 100644 tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86.iso.txt
create mode 100644 tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86_64.iso.txt
delete mode 100644 tests/isodata/haiku/haikunightly/haiku-nightly-anyboot.iso.txt
create mode 100644 tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt
create mode 100644 tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt
--
1.8.3.1
From fabiano at fidencio.org Tue Mar 5 21:15:00 2019
From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 22:15:00 +0100
Subject: [Libosinfo] [osinfo-db PATCH 2/4] haikur1beta1: Add info
In-Reply-To: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
References: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
Message-ID: <1551820502-21238-3-git-send-email-fabiano@fidencio.org>
Signed-off-by: Fabiano Fid?ncio
---
data/os/haiku-os.org/haiku-r1beta1.xml.in | 44 +++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 data/os/haiku-os.org/haiku-r1beta1.xml.in
diff --git a/data/os/haiku-os.org/haiku-r1beta1.xml.in b/data/os/haiku-os.org/haiku-r1beta1.xml.in
new file mode 100644
index 0000000..676dcba
--- /dev/null
+++ b/data/os/haiku-os.org/haiku-r1beta1.xml.in
@@ -0,0 +1,44 @@
+
+
+ haikur1beta1
+ <_name>Haiku R1/Beta1
+ r1beta1
+ <_vendor>Haiku, Inc.
+ haiku
+ haiku
+
+
+
+ 2018-09-28
+
+
+
+ bootimg
+ LINUX
+ 3325952
+
+
+
+
+
+ bootimg
+ LINUX
+ 3325952
+
+
+
+
+
+ 1000000000
+ 1
+ 536870912
+ 2147483648
+
+
+ 1000000000
+ 1073741824
+ 4294967296
+
+
+
+
--
1.8.3.1
From fabiano at fidencio.org Tue Mar 5 21:15:01 2019
From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 22:15:01 +0100
Subject: [Libosinfo] [libosinfo PATCH 3/4] haikunightly: Update test data
In-Reply-To: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
References: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
Message-ID: <1551820502-21238-4-git-send-email-fabiano@fidencio.org>
Signed-off-by: Fabiano Fid?ncio
---
.../haikunightly/haiku-nightly-anyboot-x86.iso.txt | 29 ++++++++++++++++++++++
.../haiku-nightly-anyboot-x86_64.iso.txt | 29 ++++++++++++++++++++++
.../haikunightly/haiku-nightly-anyboot.iso.txt | 29 ----------------------
3 files changed, 58 insertions(+), 29 deletions(-)
create mode 100644 tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86.iso.txt
create mode 100644 tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86_64.iso.txt
delete mode 100644 tests/isodata/haiku/haikunightly/haiku-nightly-anyboot.iso.txt
diff --git a/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86.iso.txt b/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86.iso.txt
new file mode 100644
index 0000000..e1a89d5
--- /dev/null
+++ b/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: haiku-nightly-x86
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, LIBISOFS-1.4.8, LIBBURN-1.4.8
+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: 1625
+El Torito VD version 1 found, boot catalog is in sector 33
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 3 (2.88MB Floppy)
+ Load segment 0
+ Sys type 0
+ Nsect 1
+ Bootoff 22 34
diff --git a/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86_64.iso.txt b/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86_64.iso.txt
new file mode 100644
index 0000000..7fb8675
--- /dev/null
+++ b/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86_64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: haiku-nightly-x86_64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, LIBISOFS-1.4.8, LIBBURN-1.4.8
+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: 3065
+El Torito VD version 1 found, boot catalog is in sector 33
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 3 (2.88MB Floppy)
+ Load segment 0
+ Sys type 0
+ Nsect 1
+ Bootoff 5C2 1474
diff --git a/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot.iso.txt b/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot.iso.txt
deleted file mode 100644
index 1031567..0000000
--- a/tests/isodata/haiku/haikunightly/haiku-nightly-anyboot.iso.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id: LINUX
-Volume id: bootimg
-Volume set id:
-Publisher id:
-Data preparer id:
-Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
-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: 1624
-El Torito VD version 1 found, boot catalog is in sector 32
-Joliet with UCS level 3 found
-Rock Ridge signatures version 1 found
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID ''
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 3 (2.88MB Floppy)
- Load segment 0
- Sys type 0
- Nsect 1
- Bootoff 21 33
--
1.8.3.1
From fabiano at fidencio.org Tue Mar 5 21:15:02 2019
From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 5 Mar 2019 22:15:02 +0100
Subject: [Libosinfo] [libosinfo PATCH 4/4] haikur1beta1: Add tests data
In-Reply-To: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
References: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
Message-ID: <1551820502-21238-5-git-send-email-fabiano@fidencio.org>
Signed-off-by: Fabiano Fid?ncio
---
.../haikur1beta1/haiku-release-anyboot-x86.iso.txt | 29 ++++++++++++++++++++++
.../haiku-release-anyboot-x86_64.iso.txt | 29 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt
create mode 100644 tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt
diff --git a/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt
new file mode 100644
index 0000000..1031567
--- /dev/null
+++ b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: bootimg
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+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: 1624
+El Torito VD version 1 found, boot catalog is in sector 32
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 3 (2.88MB Floppy)
+ Load segment 0
+ Sys type 0
+ Nsect 1
+ Bootoff 21 33
diff --git a/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt
new file mode 100644
index 0000000..1031567
--- /dev/null
+++ b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: bootimg
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+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: 1624
+El Torito VD version 1 found, boot catalog is in sector 32
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 3 (2.88MB Floppy)
+ Load segment 0
+ Sys type 0
+ Nsect 1
+ Bootoff 21 33
--
1.8.3.1
From cfergeau at redhat.com Wed Mar 6 08:13:32 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 6 Mar 2019 09:13:32 +0100
Subject: [Libosinfo] [osinfo-db PATCH] centos7: Add CentOS 7 entry
In-Reply-To: <1551812618-22189-1-git-send-email-fabiano@fidencio.org>
References: <1551812618-22189-1-git-send-email-fabiano@fidencio.org>
Message-ID: <20190306081332.GQ5232@natto.ory.fergeau.eu>
On Tue, Mar 05, 2019 at 08:03:38PM +0100, Fabiano Fid?ncio wrote:
> "centos7" is the preferred way to display and advertise CentOS 7, mainly
> because CentOS does not support pointing releases at all.
>
> After talking with Jim Perrin, a CentOS board member, we've decided that
> the change from centos7.0 to centos7 would be the way to go.
>
> As we can't break backward compatibility, we can't just rename
> centos-7.0.xml.in to centos-7.xml.in and adjust the bits accordingly.
> Knowing that, the path to take is creating a new centos-7.xml.in entry
> that contains exactly the same content of centos-7.0.xml.in, adjust the
> bits in the new entry and change centos-7.0 to "clone" centos-7.
Hmm, I would mark centos-7 as upgrading centos-7.0, maybe mark
centos-7.0 as EOL'ed (as we'd be at centos-7.6 by now), and only
maintain centos-7 from now on.
>
> Although this is not the most elegant solution, it ensures we properly
> advertise CentOS in the way its community wants and also do not break
> backward compatibility.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> data/os/centos.org/centos-7.0.xml.in | 4 +-
> data/os/centos.org/centos-7.xml.in | 86 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 89 insertions(+), 1 deletion(-)
> create mode 100644 data/os/centos.org/centos-7.xml.in
>
> diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
> index 7fc6d8d..bbfeb48 100644
> --- a/data/os/centos.org/centos-7.0.xml.in
> +++ b/data/os/centos.org/centos-7.0.xml.in
> @@ -1,6 +1,8 @@
>
>
> +
> +
Yes and no, I think we want to remove the system-id/volume-id bits from
this file, as otherwise what a given centos ISO is going to match is
going to be undeterministic (unless you fixed this recently?)
Christophe
>
> centos7.0
> <_name>CentOS 7.0
> @@ -9,7 +11,7 @@
> linux
> centos
>
> -
> +
>
> 2014-07-07
>
> diff --git a/data/os/centos.org/centos-7.xml.in b/data/os/centos.org/centos-7.xml.in
> new file mode 100644
> index 0000000..382bbc6
> --- /dev/null
> +++ b/data/os/centos.org/centos-7.xml.in
> @@ -0,0 +1,86 @@
> +
> +
> +
> +
> +
> + centos7
> + <_name>CentOS 7
> + 7
> + <_vendor>CentOS
> + linux
> + centos
> +
> +
> +
> + 2014-07-07
> +
> +
> + <_name>CentOS 7 (GNOME)
> +
> +
> + <_name>CentOS 7 (KDE)
> +
> +
> +
> + https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD.iso
> +
> + LINUX
> + CentOS 7 x86_64
> +
> + isolinux/vmlinuz
> + isolinux/initrd.img
> +
> +
> +
> +
> + https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso
> +
> + LINUX
> + CentOS-7-x86_64-LiveGNOME*
> +
> + isolinux/vmlinuz0
> + isolinux/initrd0.img
> +
> +
> +
> +
> + https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveKDE.iso
> +
> + LINUX
> + CentOS-7-x86_64-LiveKDE*
> +
> + isolinux/vmlinuz0
> + isolinux/initrd0.img
> +
> +
> +
> + http://mirror.centos.org/centos-7/7/os/x86_64/
> +
> + CentOS
> + ^7$
> + x86_64
> +
> +
> +
> +
> +
> + 1
> + 1000000000
> + 1073741824
> + 10737418240
> +
> +
> +
> + 1000000000
> + 1073741824
> + 10737418240
> +
> +
> +
> +
> +
> +
> +
> +
> +
> --
> 1.8.3.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From fidencio at redhat.com Wed Mar 6 16:14:57 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 6 Mar 2019 17:14:57 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/2] install-config: Add
_set_installer_url()
Message-ID: <20190306161458.31410-1-fidencio@redhat.com>
Although the installer URL can be taken from OsinfoTree, there are
situations where OsinfoTree doesn't have a URL or even the management
apps should prefer the URL set by their users instead of fallbacking to
the one get from OsinfoTree.
Signed-off-by: Fabiano Fid?ncio
---
osinfo/libosinfo.syms | 6 ++++++
osinfo/osinfo_install_config.c | 28 ++++++++++++++++++++++++++++
osinfo/osinfo_install_config.h | 6 ++++++
3 files changed, 40 insertions(+)
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index 5c200e3..aa8e6d7 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -568,6 +568,12 @@ LIBOSINFO_1.4.0 {
osinfo_media_get_install_script_list;
} LIBOSINFO_1.3.0;
+LIBOSINFO_1.5.0 {
+ global:
+ osinfo_install_config_get_installation_url;
+ osinfo_install_config_set_installation_url;
+} LIBOSINFO_1.4.0;
+
/* Symbols in next release...
LIBOSINFO_0.0.2 {
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index abe37bd..af4b47e 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -688,6 +688,34 @@ gboolean osinfo_install_config_get_driver_signing(OsinfoInstallConfig *config)
TRUE);
}
+/**
+ * osinfo_install_config_set_installation_url:
+ * @config: the install config
+ * @url: the URL used to perform the installation
+ *
+ * When performing a tree based installation the script will need the installation
+ * URL to be set, whenever the installation is performed from a non canonical place.
+ */
+void osinfo_install_config_set_installation_url(OsinfoInstallConfig *config,
+ const gchar *url)
+{
+ osinfo_entity_set_param(OSINFO_ENTITY(config),
+ OSINFO_INSTALL_CONFIG_PROP_INSTALLATION_URL,
+ url);
+}
+
+/**
+ * osinfo_install_config_get_installation_url:
+ * @config
+ *
+ * Returns the URL the script will use to perform the installation.
+ */
+const gchar *osinfo_install_config_get_installation_url(OsinfoInstallConfig *config)
+{
+ return osinfo_entity_get_param_value(OSINFO_ENTITY(config),
+ OSINFO_INSTALL_CONFIG_PROP_INSTALLATION_URL);
+}
+
/*
* Local variables:
* indent-tabs-mode: nil
diff --git a/osinfo/osinfo_install_config.h b/osinfo/osinfo_install_config.h
index f9db88b..c219c3a 100644
--- a/osinfo/osinfo_install_config.h
+++ b/osinfo/osinfo_install_config.h
@@ -69,6 +69,8 @@
#define OSINFO_INSTALL_CONFIG_PROP_DRIVER_SIGNING "driver-signing"
+#define OSINFO_INSTALL_CONFIG_PROP_INSTALLATION_URL "installation-url"
+
typedef struct _OsinfoInstallConfig OsinfoInstallConfig;
typedef struct _OsinfoInstallConfigClass OsinfoInstallConfigClass;
typedef struct _OsinfoInstallConfigPrivate OsinfoInstallConfigPrivate;
@@ -199,6 +201,10 @@ void osinfo_install_config_set_driver_signing(OsinfoInstallConfig *config,
gboolean signing);
gboolean osinfo_install_config_get_driver_signing(OsinfoInstallConfig *config);
+void osinfo_install_config_set_installation_url(OsinfoInstallConfig *config,
+ const gchar *url);
+const gchar *osinfo_install_config_get_installation_url(OsinfoInstallConfig *config);
+
#endif /* __OSINFO_INSTALL_CONFIG_H__ */
/*
* Local variables:
--
2.20.1
From fidencio at redhat.com Wed Mar 6 16:14:58 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 6 Mar 2019 17:14:58 +0100
Subject: [Libosinfo] [libosinfo PATCH 2/2] tests: Add coverage for
_set_installer_url()
In-Reply-To: <20190306161458.31410-1-fidencio@redhat.com>
References: <20190306161458.31410-1-fidencio@redhat.com>
Message-ID: <20190306161458.31410-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
tests/install-script.xsl | 1 +
tests/test-install-script.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/tests/install-script.xsl b/tests/install-script.xsl
index f355152..09a5308 100644
--- a/tests/install-script.xsl
+++ b/tests/install-script.xsl
@@ -20,6 +20,7 @@ skipx
network --device eth0 --bootproto dhcp
rootpw
timezone --utc
+url
bootloader --location=mbr
zerombr
diff --git a/tests/test-install-script.c b/tests/test-install-script.c
index 9252423..a19146b 100644
--- a/tests/test-install-script.c
+++ b/tests/test-install-script.c
@@ -37,6 +37,7 @@ static const gchar *expectData = \
"network --device eth0 --bootproto dhcp\n" \
"rootpw 123456\n" \
"timezone --utc Europe/London\n" \
+ "url http://foo.bar\n" \
"bootloader --location=mbr\n" \
"zerombr\n" \
"\n" \
@@ -107,6 +108,8 @@ static OsinfoInstallConfig *test_get_config(void)
osinfo_install_config_set_user_autologin(config, TRUE);
osinfo_install_config_set_user_administrator(config, TRUE);
+ osinfo_install_config_set_installation_url(config, "http://foo.bar");
+
return config;
}
--
2.20.1
From crobinso at redhat.com Wed Mar 6 19:44:16 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 6 Mar 2019 14:44:16 -0500
Subject: [Libosinfo] [osinfo-db PATCH 0/4] Update haiku entries
In-Reply-To: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
References: <1551820502-21238-1-git-send-email-fabiano@fidencio.org>
Message-ID:
On 3/5/19 4:14 PM, Fabiano Fid?ncio wrote:
> Let's update haiku-nightly to match the volume-id of the ISOs being
> currently generated.
>
> Unfortunately, their infra to generate the ISOs was a bit messy in the
> past, which caused some nightly ISOs to be generated with the same
> volume-id as the R1Beta1 release.
>
> I've decided to just leave the R1Beta1 with that volume-id (as it is an
> official release) and convinced Haiku developers to change the volume-id
> for the nightly ones.
>
> This patchset ends up updating the volume-id for the nightly to match the
> change on their infra and adding a R1Beta1 entry, allowing us to close
> https://gitlab.com/libosinfo/osinfo-db/issues/18
>
Nice job working with distro devs to sort it out
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Wed Mar 6 20:00:56 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 6 Mar 2019 15:00:56 -0500
Subject: [Libosinfo] [osinfo-db PATCH] centos7: Add CentOS 7 entry
In-Reply-To: <1551812618-22189-1-git-send-email-fabiano@fidencio.org>
References: <1551812618-22189-1-git-send-email-fabiano@fidencio.org>
Message-ID: <68abfb05-03c9-d421-4079-a7007214ded6@redhat.com>
On 3/5/19 2:03 PM, Fabiano Fid?ncio wrote:
> "centos7" is the preferred way to display and advertise CentOS 7, mainly
> because CentOS does not support pointing releases at all.
>
> After talking with Jim Perrin, a CentOS board member, we've decided that
> the change from centos7.0 to centos7 would be the way to go.
>
> As we can't break backward compatibility, we can't just rename
> centos-7.0.xml.in to centos-7.xml.in and adjust the bits accordingly.
> Knowing that, the path to take is creating a new centos-7.xml.in entry
> that contains exactly the same content of centos-7.0.xml.in, adjust the
> bits in the new entry and change centos-7.0 to "clone" centos-7.
>
> Although this is not the most elegant solution, it ensures we properly
> advertise CentOS in the way its community wants and also do not break
> backward compatibility.
>
> Signed-off-by: Fabiano Fid?ncio
This strikes me as unpleasant, just to essentially fix a short-id name.
Multiple is allowed in the rng and there's some examples in
data/ already, see every ubuntu entry for example. But there's no way
via the API to access that info so it's presently useless.
What would adding actual support for multiple , or some kind
of alias system, look like? We could add a new prop
OSINFO_PRODUCT_PROP_SHORT_IDS, which instead returns a list, and
get_short_ids() API to match. If apps are already using the filter APIs
to do OS lookup in some way, maybe we make filtering by
OSINFO_PRODUCT_PROP_SHORT_ID also check the SHORT_IDS list, so they will
'just work' in picking up the change in that respect. virt-manager
doesn't use those APIs so it would need to be adjusted a bit
Or stick with a single short-id and add an explicit field with
OSINFO_PRODUCT_PROP_ALIASES to match, etc
- Cole
From crobinso at redhat.com Wed Mar 6 20:24:55 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 6 Mar 2019 15:24:55 -0500
Subject: [Libosinfo] [libosinfo PATCH 1/2] install-config: Add
_set_installer_url()
In-Reply-To: <20190306161458.31410-1-fidencio@redhat.com>
References: <20190306161458.31410-1-fidencio@redhat.com>
Message-ID: <224cd659-3772-e71f-0a27-28ac029176db@redhat.com>
On 3/6/19 11:14 AM, Fabiano Fid?ncio wrote:
> Although the installer URL can be taken from OsinfoTree, there are
> situations where OsinfoTree doesn't have a URL or even the management
> apps should prefer the URL set by their users instead of fallbacking to
> the one get from OsinfoTree.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/libosinfo.syms | 6 ++++++
> osinfo/osinfo_install_config.c | 28 ++++++++++++++++++++++++++++
> osinfo/osinfo_install_config.h | 6 ++++++
> 3 files changed, 40 insertions(+)
Ah so without this we can't even do --unattended installs with a custom
--location. Makes sense and code looks sensible. Both:
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Wed Mar 6 20:30:41 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 6 Mar 2019 15:30:41 -0500
Subject: [Libosinfo] [PATCH libosinfo 2/2] Remove emacs 'Local
variables' annotations
In-Reply-To: <20190304100835.GD4239@redhat.com>
References:
<20190304100835.GD4239@redhat.com>
Message-ID: <9b1c4668-3825-a700-1922-0112ddd29c27@redhat.com>
On 3/4/19 5:08 AM, Daniel P. Berrang? wrote:
> On Sat, Mar 02, 2019 at 06:35:18PM -0500, Cole Robinson wrote:
>> No other virt projects have annotations like this, plus IMO
>> .editorconfig handles this in a much nicer way and more flexible
>> way. Ditch them
>
> .editorconfig requires users to install extra packages to work.
>
> If we want to remove emacs annotations, then we need to have
> a .dir-locals.el file defined, so that correct indentation is
> used out of the box with emacs.
>
>
> Regards,
> Daniel
>
Does the attached patch work for you? I've never used emacs so I don't
trust my testing
- Cole
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-toplevel-.dir-locals.el.patch
Type: text/x-patch
Size: 860 bytes
Desc: not available
URL:
From fidencio at redhat.com Thu Mar 7 09:27:19 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 10:27:19 +0100
Subject: [Libosinfo] [libosinfo PATCH] spec: Add build_timestamp to the
Release
Message-ID: <20190307092719.8564-1-fidencio@redhat.com>
The upstream spec file is used for anything else than local builds
and/or as a reference for the downstream spec file.
Knowing that, let's add a build_timestamp to its Release tag so we could
generate builds (either via ./prepare-release.sh or, possibly, taking
advantage of Copr infrastructure) for the project that can be easily
updated every new build and also doesn't clash with the Fedora official
builds*. This change may be really helpful for testing management apps
code depending on to-be-released libosinfo code.
*: The release number was changed from 1 to 0 as official Fedora releases
will always use 1. Meaning that users wouldn't face any issue upgrading
from a custom generated build to a Fedora official one.
Signed-off-by: Fabiano Fid?ncio
---
If this patch gets accepted, I'll propose the same changes for
osinfo-db-tools.
I'm not totally sure whether I can easily trigger a new Copr build based
on commit changes as it'd require a .spec and not a .spec.in, but having
this patch in would already help people doing local builds for testing
purposes.
---
libosinfo.spec.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index fd7e55c..f75e31d 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -1,9 +1,11 @@
# -*- rpm-spec -*-
+%define build_timestamp %(date +"%Y%m%d%H%M%s")
+
Summary: A library for managing OS information for virtualization
Name: libosinfo
Version: @VERSION@
-Release: 1%{?dist}
+Release: 0.%{?build_timestamp}%{?dist}
License: LGPLv2+
Group: Development/Libraries
Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
--
2.20.1
From berrange at redhat.com Thu Mar 7 09:46:27 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 7 Mar 2019 09:46:27 +0000
Subject: [Libosinfo] [PATCH libosinfo 2/2] Remove emacs 'Local
variables' annotations
In-Reply-To: <9b1c4668-3825-a700-1922-0112ddd29c27@redhat.com>
References:
<20190304100835.GD4239@redhat.com>
<9b1c4668-3825-a700-1922-0112ddd29c27@redhat.com>
Message-ID: <20190307094627.GC32268@redhat.com>
On Wed, Mar 06, 2019 at 03:30:41PM -0500, Cole Robinson wrote:
> On 3/4/19 5:08 AM, Daniel P. Berrang? wrote:
> > On Sat, Mar 02, 2019 at 06:35:18PM -0500, Cole Robinson wrote:
> >> No other virt projects have annotations like this, plus IMO
> >> .editorconfig handles this in a much nicer way and more flexible
> >> way. Ditch them
> >
> > .editorconfig requires users to install extra packages to work.
> >
> > If we want to remove emacs annotations, then we need to have
> > a .dir-locals.el file defined, so that correct indentation is
> > used out of the box with emacs.
> >
> >
> > Regards,
> > Daniel
> >
>
> Does the attached patch work for you? I've never used emacs so I don't
> trust my testing
It matches the current per-file rules so that's good enough. Libvirt
also sets K&R style in its .dir-locals.el, but the the only really
key thing is the tab-killing part from my POV.
> From 1a716cbbe5a32f829cf90ead6dfdceefd8d620f3 Mon Sep 17 00:00:00 2001
> Message-Id: <1a716cbbe5a32f829cf90ead6dfdceefd8d620f3.1551904198.git.crobinso at redhat.com>
> From: Cole Robinson
> Date: Wed, 6 Mar 2019 15:27:42 -0500
> Subject: [PATCH libosinfo] Add toplevel .dir-locals.el
>
> This centralizes emacs config in a top level file, matching the
> bits sprinkled around in 'Local variable' comments
>
> Signed-off-by: Cole Robinson
> ---
> .dir-locals.el | 7 +++++++
> 1 file changed, 7 insertions(+)
> create mode 100644 .dir-locals.el
>
> diff --git a/.dir-locals.el b/.dir-locals.el
> new file mode 100644
> index 0000000..85795b3
> --- /dev/null
> +++ b/.dir-locals.el
> @@ -0,0 +1,7 @@
> +(
> + (c-mode . (
> + (indent-tabs-mode . nil)
> + (c-indent-level . 4)
> + (c-basic-offset . 4)
> + ))
> + )
> --
> 2.20.1
>
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From fidencio at redhat.com Thu Mar 7 10:28:38 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 11:28:38 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/3] centos,
kickstart: Improve installation URL usage
Message-ID: <20190307102840.28578-1-fidencio@redhat.com>
Let's always prefer using the URL passed by some management app, if
there's not, let's fallback to the URL set in the OsinfoTree and,
finally, if there's none, let's fallback to the known one.
Signed-off-by: Fabiano Fid?ncio
---
.../centos-kickstart-desktop.xml.in | 19 ++++++++++++++++++-
.../centos.org/centos-kickstart-jeos.xml.in | 19 ++++++++++++++++++-
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
index a1c3373..18cd2dd 100644
--- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
@@ -91,6 +91,23 @@
+
+
+
+
+
+
+
+
+
+ http://mirror.centos.org/centos/
+
+ /os/
+
+
+
+
+
# Install script for profile
@@ -126,7 +143,7 @@ logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
reboot
-url --url="http://mirror.centos.org/centos//os/"
+url --url=
%packages
diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
index 0f1efc2..d8290e4 100644
--- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
@@ -83,6 +83,23 @@
+
+
+
+
+
+
+
+
+
+ http://mirror.centos.org/centos/
+
+ /os/
+
+
+
+
+
# Install script for profile
@@ -120,7 +137,7 @@ logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
reboot
-url --url="http://mirror.centos.org/centos//os/"
+url --url=
%packages
--
2.20.1
From fidencio at redhat.com Thu Mar 7 10:28:39 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 11:28:39 +0100
Subject: [Libosinfo] [libosinfo PATCH 2/3] rhel,
kickstart: Be aware of network installations
In-Reply-To: <20190307102840.28578-1-fidencio@redhat.com>
References: <20190307102840.28578-1-fidencio@redhat.com>
Message-ID: <20190307102840.28578-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.../redhat.com/rhel-kickstart-desktop.xml.in | 17 +++++++++++++++++
.../redhat.com/rhel-kickstart-jeos.xml.in | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index e2349d2..b68c79e 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -53,6 +53,17 @@
+
+
+
+
+
+
+
+
+
+
+
ks=hd:
@@ -62,8 +73,10 @@
# Install script for profile
+
install
cdrom
+
keyboard us
lang
network --onboot yes --bootproto dhcp --noipv6 --hostname=
@@ -92,6 +105,10 @@ logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow
logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
reboot
+
+url --url=
+
+
%packages
@core
@x11
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index 8c0b42d..dc23d2a 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -45,6 +45,17 @@
+
+
+
+
+
+
+
+
+
+
+
ks=hd:
@@ -54,8 +65,10 @@
# Install script for profile
+
install
cdrom
+
text
@@ -88,6 +101,10 @@ logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow
logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
reboot
+
+url --url=
+
+
%packages
--
2.20.1
From fidencio at redhat.com Thu Mar 7 10:28:40 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 11:28:40 +0100
Subject: [Libosinfo] [libosinfo PATCH 3/3] rhel,
kickstart: Provide support for initrd injection
In-Reply-To: <20190307102840.28578-1-fidencio@redhat.com>
References: <20190307102840.28578-1-fidencio@redhat.com>
Message-ID: <20190307102840.28578-3-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.../redhat.com/rhel-kickstart-desktop.xml.in | 17 +++++++++++++----
.../redhat.com/rhel-kickstart-jeos.xml.in | 17 +++++++++++++----
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index b68c79e..214c3b8 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -20,6 +20,7 @@
cdrom
disk
floppy
+ initrd
image/png
@@ -65,10 +66,18 @@
- ks=hd:
-
- :/
-
+ ks=
+
+
+ file:/
+
+
+ hd:
+
+ :/
+
+
+
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index dc23d2a..5920e4a 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -15,6 +15,7 @@
cdrom
disk
floppy
+ initrd
- ks=hd:
-
- :/
-
+ ks=
+
+
+ file:/
+
+
+ hd:
+
+ :/
+
+
+
--
2.20.1
From fidencio at redhat.com Thu Mar 7 10:30:19 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 11:30:19 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/4] fedora,
kickstart: Use autopart when possible
Message-ID: <20190307103022.28887-1-fidencio@redhat.com>
Let's take advantage of "autopart" and stop setting up the partitions
manually.
autopart is available since Fedora3 according to its documentation:
https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#id3
Signed-off-by: Fabiano Fid?ncio
---
.../fedoraproject.org/fedora-kickstart-desktop.xml.in | 7 +------
.../fedoraproject.org/fedora-kickstart-jeos.xml.in | 10 +++++++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index 7d21715..cd2d517 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -137,12 +137,7 @@ clearpart --all --drives=
firstboot --disable
-part biosboot --fstype=biosboot --size=1
-part /boot --fstype --recommended --ondisk=
-part pv.2 --size=1 --grow --ondisk=
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+autopart
reboot
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 28c6628..7683b6a 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -136,14 +136,18 @@ zerombr yes
clearpart --all --drives=
-
-part biosboot --fstype=biosboot --size=1
-
+
+
part /boot --fstype --recommended --ondisk=
part pv.2 --size=1 --grow --ondisk=
volgroup VolGroup00 --pesize=32768 pv.2
logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
logvol / --fstype --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+
+
+autopart
+
+
reboot
--
2.20.1
From fidencio at redhat.com Thu Mar 7 10:30:20 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 11:30:20 +0100
Subject: [Libosinfo] [libosinfo PATCH 2/4] silverblue,
kickstart: Use autopart when possible
In-Reply-To: <20190307103022.28887-1-fidencio@redhat.com>
References: <20190307103022.28887-1-fidencio@redhat.com>
Message-ID: <20190307103022.28887-2-fidencio@redhat.com>
Let's take advantage of "autopart" and stop setting up the partitions
manually.
autopart is available since Fedora3 according to its documentation:
https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#id3
Signed-off-by: Fabiano Fid?ncio
---
.../silverblue-kickstart-desktop.xml.in | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
index 17841bf..09cdd62 100644
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -59,16 +59,10 @@ timezone --utc
bootloader --location=mbr
zerombr
-clearpart --all --drives=/dev/vda
-
firstboot --disable
-part biosboot --fstype=biosboot --size=1
-part /boot --fstype ext4 --recommended --ondisk=/dev/vda
-part pv.2 --size=1 --grow --ondisk=/dev/vda
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype xfs --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+clearpart --all --drives=/dev/vda
+autopart
--
2.20.1
From fidencio at redhat.com Thu Mar 7 10:30:21 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 11:30:21 +0100
Subject: [Libosinfo] [libosinfo PATCH 3/4] rhel,
kickstart: Use autopart when possible
In-Reply-To: <20190307103022.28887-1-fidencio@redhat.com>
References: <20190307103022.28887-1-fidencio@redhat.com>
Message-ID: <20190307103022.28887-3-fidencio@redhat.com>
Let's take advantage of "autopart" and stop setting up the partitions
manually.
autopart is available since RHEL-6 according to its documentation:
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/installation_guide/s1-kickstart2-options
Signed-off-by: Fabiano Fid?ncio
---
.../redhat.com/rhel-kickstart-desktop.xml.in | 13 +------------
.../redhat.com/rhel-kickstart-jeos.xml.in | 14 +-------------
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index e2349d2..ba5d3cb 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -78,18 +78,7 @@ clearpart --all --drives=
firstboot --disable
-
-
-part /boot --fstype ext4 --size=1024 --ondisk=
-
-
-part /boot --fstype ext4 --recommended --ondisk=
-
-
-part pv.2 --size=1 --grow --ondisk=
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+autopart
reboot
%packages
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index 8c0b42d..f39d7da 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -73,19 +73,7 @@ zerombr
clearpart --all --drives=
-
-
-
-part /boot --fstype ext4 --size=1024 --ondisk=
-
-
-part /boot --fstype ext4 --recommended --ondisk=
-
-
-part pv.2 --size=1 --grow --ondisk=
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+autopart
reboot
%packages
--
2.20.1
From fidencio at redhat.com Thu Mar 7 10:30:22 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 7 Mar 2019 11:30:22 +0100
Subject: [Libosinfo] [libosinfo PATCH 4/4] centos,
kickstart: Use autopart when possible
In-Reply-To: <20190307103022.28887-1-fidencio@redhat.com>
References: <20190307103022.28887-1-fidencio@redhat.com>
Message-ID: <20190307103022.28887-4-fidencio@redhat.com>
Let's take advantage of "autopart" and stop setting up the partitions
manually.
autopart is available since RHEL-6 according to its documentation:
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/installation_guide/s1-kickstart2-options
Signed-off-by: Fabiano Fid?ncio
---
.../centos.org/centos-kickstart-desktop.xml.in | 13 +------------
.../centos.org/centos-kickstart-jeos.xml.in | 14 +-------------
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
index a1c3373..d7602d5 100644
--- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
@@ -111,18 +111,7 @@ clearpart --all --drives=
firstboot --disable
-
-
-part /boot --fstype ext4 --size=1024 --ondisk=
-
-
-part /boot --fstype ext4 --recommended --ondisk=
-
-
-part pv.2 --size=1 --grow --ondisk=
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+autopart
reboot
diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
index 0f1efc2..14ccc1c 100644
--- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
@@ -104,19 +104,7 @@ zerombr
clearpart --all --drives=
-
-
-
-part /boot --fstype ext4 --size=1024 --ondisk=
-
-
-part /boot --fstype ext4 --recommended --ondisk=
-
-
-part pv.2 --size=1 --grow --ondisk=
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+autopart
reboot
--
2.20.1
From fidencio at redhat.com Thu Mar 7 14:31:39 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Thu, 07 Mar 2019 15:31:39 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/7] spec: Switch to
%ldconfig_scriptlets
In-Reply-To: <20190305134725.GD5232@natto.ory.fergeau.eu>
References: <20190305093755.28934-1-fidencio@redhat.com>
<20190305093755.28934-2-fidencio@redhat.com>
<20190305134725.GD5232@natto.ory.fergeau.eu>
Message-ID:
On Tue, 2019-03-05 at 14:47 +0100, Christophe Fergeau wrote:
> On Tue, Mar 05, 2019 at 10:37:49AM +0100, Fabiano Fid?ncio wrote:
> > This commit is bringing upstream the change done on Fedora on
> > af0ce7aab60e.
>
> Feature is documented at
> https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets
> I'm not sure el7 will have it, but I don't know what we aim to
> support
> with this spec file.
>
> Reviewed-by: Christophe Fergeau
It doesn't work with el7, nice catch teuf!
I'm dropping this patch.
>
> > Signed-off-by: Fabiano Fid?ncio
> > ---
> > libosinfo.spec.in | 7 +------
> > 1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> > index fd7e55c..57f8d94 100644
> > --- a/libosinfo.spec.in
> > +++ b/libosinfo.spec.in
> > @@ -79,12 +79,7 @@ then
> > exit 1
> > fi
> >
> > -%clean
> > -rm -fr %{buildroot}
> > -
> > -%post -p /sbin/ldconfig
> > -
> > -%postun -p /sbin/ldconfig
> > +%ldconfig_scriptlets
> >
> > %files -f %{name}.lang
> > %defattr(-, root, root)
> > --
> > 2.20.1
> >
> > _______________________________________________
> > Libosinfo mailing list
> > Libosinfo at redhat.com
> > https://www.redhat.com/mailman/listinfo/libosinfo
From crobinso at redhat.com Thu Mar 7 22:49:51 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 7 Mar 2019 17:49:51 -0500
Subject: [Libosinfo] [PATCH libosinfo 2/2] Remove emacs 'Local
variables' annotations
In-Reply-To: <20190307094627.GC32268@redhat.com>
References:
<20190304100835.GD4239@redhat.com>
<9b1c4668-3825-a700-1922-0112ddd29c27@redhat.com>
<20190307094627.GC32268@redhat.com>
Message-ID: <27e23ffa-1683-8d8d-358e-df1d20258e7b@redhat.com>
On 3/7/19 4:46 AM, Daniel P. Berrang? wrote:
> On Wed, Mar 06, 2019 at 03:30:41PM -0500, Cole Robinson wrote:
>> On 3/4/19 5:08 AM, Daniel P. Berrang? wrote:
>>> On Sat, Mar 02, 2019 at 06:35:18PM -0500, Cole Robinson wrote:
>>>> No other virt projects have annotations like this, plus IMO
>>>> .editorconfig handles this in a much nicer way and more flexible
>>>> way. Ditch them
>>>
>>> .editorconfig requires users to install extra packages to work.
>>>
>>> If we want to remove emacs annotations, then we need to have
>>> a .dir-locals.el file defined, so that correct indentation is
>>> used out of the box with emacs.
>>>
>>>
>>> Regards,
>>> Daniel
>>>
>>
>> Does the attached patch work for you? I've never used emacs so I don't
>> trust my testing
>
> It matches the current per-file rules so that's good enough. Libvirt
> also sets K&R style in its .dir-locals.el, but the the only really
> key thing is the tab-killing part from my POV.
>
>> From 1a716cbbe5a32f829cf90ead6dfdceefd8d620f3 Mon Sep 17 00:00:00 2001
>> Message-Id: <1a716cbbe5a32f829cf90ead6dfdceefd8d620f3.1551904198.git.crobinso at redhat.com>
>> From: Cole Robinson
>> Date: Wed, 6 Mar 2019 15:27:42 -0500
>> Subject: [PATCH libosinfo] Add toplevel .dir-locals.el
>>
>> This centralizes emacs config in a top level file, matching the
>> bits sprinkled around in 'Local variable' comments
>>
>> Signed-off-by: Cole Robinson
>> ---
>> .dir-locals.el | 7 +++++++
>> 1 file changed, 7 insertions(+)
>> create mode 100644 .dir-locals.el
>>
>> diff --git a/.dir-locals.el b/.dir-locals.el
>> new file mode 100644
>> index 0000000..85795b3
>> --- /dev/null
>> +++ b/.dir-locals.el
>> @@ -0,0 +1,7 @@
>> +(
>> + (c-mode . (
>> + (indent-tabs-mode . nil)
>> + (c-indent-level . 4)
>> + (c-basic-offset . 4)
>> + ))
>> + )
>> --
>> 2.20.1
>>
>
> Reviewed-by: Daniel P. Berrang?
>
Thanks, I moved this before the 'Local variables' bit and pushed those
two patches. I've shelved the editorconfig patch
- Cole
From crobinso at redhat.com Fri Mar 8 00:00:00 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 7 Mar 2019 19:00:00 -0500
Subject: [Libosinfo] [libosinfo PATCH 1/4] fedora,
kickstart: Use autopart when possible
In-Reply-To: <20190307103022.28887-1-fidencio@redhat.com>
References: <20190307103022.28887-1-fidencio@redhat.com>
Message-ID:
On 3/7/19 5:30 AM, Fabiano Fid?ncio wrote:
> Let's take advantage of "autopart" and stop setting up the partitions
> manually.
>
> autopart is available since Fedora3 according to its documentation:
> https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#id3
>
> Signed-off-by: Fabiano Fid?ncio
Series:
Reviewed-by: Cole Robinson
But I'm amazed we even claim fedora03 installer script works, I wonder
if anyone has tested it. Also your patch prefix says 'libosinfo' but
these are osinfo-db patches
- Cole
From crobinso at redhat.com Fri Mar 8 00:07:36 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 7 Mar 2019 19:07:36 -0500
Subject: [Libosinfo] [libosinfo PATCH 1/3] centos,
kickstart: Improve installation URL usage
In-Reply-To: <20190307102840.28578-1-fidencio@redhat.com>
References: <20190307102840.28578-1-fidencio@redhat.com>
Message-ID:
On 3/7/19 5:28 AM, Fabiano Fid?ncio wrote:
> Let's always prefer using the URL passed by some management app, if
> there's not, let's fallback to the URL set in the OsinfoTree and,
> finally, if there's none, let's fallback to the known one.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> .../centos-kickstart-desktop.xml.in | 19 ++++++++++++++++++-
> .../centos.org/centos-kickstart-jeos.xml.in | 19 ++++++++++++++++++-
> 2 files changed, 36 insertions(+), 2 deletions(-)
Series:
Reviewed-by: Cole Robinson
- Cole
From fidencio at redhat.com Fri Mar 8 08:23:15 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Fri, 08 Mar 2019 09:23:15 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/4] fedora,
kickstart: Use autopart when possible
In-Reply-To:
References: <20190307103022.28887-1-fidencio@redhat.com>
Message-ID:
On Thu, 2019-03-07 at 19:00 -0500, Cole Robinson wrote:
> On 3/7/19 5:30 AM, Fabiano Fid?ncio wrote:
> > Let's take advantage of "autopart" and stop setting up the
> > partitions
> > manually.
> >
> > autopart is available since Fedora3 according to its documentation:
> > https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#id3
> >
> > Signed-off-by: Fabiano Fid?ncio
>
> Series:
>
> Reviewed-by: Cole Robinson
>
> But I'm amazed we even claim fedora03 installer script works, I
> wonder
> if anyone has tested it.
Nops, anyone ahs tested it so far ... and, most likely, I'll be
removing those soon.
It's part of my plan to do to Fedora the same work that I've done for
Ubuntu ... check whether we claim to support can actually be supported.
:-)
> Also your patch prefix says 'libosinfo' but
> these are osinfo-db patches
Oh, my bad! :-(
>
> - Cole
From fidencio at redhat.com Fri Mar 8 08:58:03 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 8 Mar 2019 09:58:03 +0100
Subject: [Libosinfo] [osinfo-db PATCH] ubuntu14.04: Update URLs from 14.04.5
to 14.04.6
Message-ID: <20190308085803.16516-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
Pushed as test-mediauris fix
---
data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
index b7500cd..dccb815 100644
--- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
@@ -31,7 +31,7 @@
- http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-i386.iso
+ http://releases.ubuntu.com/14.04/ubuntu-14.04.6-server-i386.iso
Ubuntu-Server 14.04(.\d\+?)? LTS i386
@@ -42,7 +42,7 @@
- http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso
+ http://releases.ubuntu.com/14.04/ubuntu-14.04.6-server-amd64.iso
Ubuntu-Server 14.04(.\d\+?)? LTS amd64
@@ -53,7 +53,7 @@
- http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-i386.iso
+ http://releases.ubuntu.com/14.04/ubuntu-14.04.6-desktop-i386.iso
Ubuntu 14.04(.\d\+?)? LTS i386
@@ -61,7 +61,7 @@
casper/initrd.lz
- http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-amd64.iso
+ http://releases.ubuntu.com/14.04/ubuntu-14.04.6-desktop-amd64.iso
Ubuntu 14.04(.\d\+?)? LTS amd64
--
2.20.1
From fidencio at redhat.com Fri Mar 8 09:06:43 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 8 Mar 2019 10:06:43 +0100
Subject: [Libosinfo] [PATCH] ubuntu14.04: Add desktop installer script to
desktop medias
Message-ID: <20190308090643.19202-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
After realising that 14.04 is still going on, I gave an
express-installation a try for the desktop profile (for the desktop
medias) and it just works as expected!
---
data/os/ubuntu.com/ubuntu-14.04.xml.in | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
index dccb815..11e9d9e 100644
--- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
@@ -59,6 +59,9 @@
casper/vmlinuz
casper/initrd.lz
+
+
+
http://releases.ubuntu.com/14.04/ubuntu-14.04.6-desktop-amd64.iso
@@ -67,6 +70,9 @@
casper/vmlinuz.efi
casper/initrd.lz
+
+
+
--
2.20.1
From fidencio at redhat.com Fri Mar 8 09:39:19 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 8 Mar 2019 10:39:19 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH] readme: Add json-glib as
dependency
Message-ID: <20190308093919.26362-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
README | 1 +
1 file changed, 1 insertion(+)
diff --git a/README b/README
index 411ceb2..b0faebb 100644
--- a/README
+++ b/README
@@ -19,6 +19,7 @@ Dependencies
- Required:
- gobject-2.0
- gio-2.0
+ - json-glib
- libarchive3
- libxml-2.0
- libxslt-1.0
--
2.20.1
From cfergeau at redhat.com Fri Mar 8 09:56:26 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 8 Mar 2019 10:56:26 +0100
Subject: [Libosinfo] [PATCH] ubuntu14.04: Add desktop installer script
to desktop medias
In-Reply-To: <20190308090643.19202-1-fidencio@redhat.com>
References: <20190308090643.19202-1-fidencio@redhat.com>
Message-ID: <20190308095626.GV29693@natto.ory.fergeau.eu>
Acked-by: Christophe Fergeau
On Fri, Mar 08, 2019 at 10:06:43AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> After realising that 14.04 is still going on, I gave an
> express-installation a try for the desktop profile (for the desktop
> medias) and it just works as expected!
> ---
> data/os/ubuntu.com/ubuntu-14.04.xml.in | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> index dccb815..11e9d9e 100644
> --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> @@ -59,6 +59,9 @@
>
> casper/vmlinuz
> casper/initrd.lz
> +
> +
> +
>
>
> http://releases.ubuntu.com/14.04/ubuntu-14.04.6-desktop-amd64.iso
> @@ -67,6 +70,9 @@
>
> casper/vmlinuz.efi
> casper/initrd.lz
> +
> +
> +
>
>
>
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Fri Mar 8 09:56:57 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 8 Mar 2019 10:56:57 +0100
Subject: [Libosinfo] [osinfo-db PATCH] ubuntu14.04: Update URLs from
14.04.5 to 14.04.6
In-Reply-To: <20190308085803.16516-1-fidencio@redhat.com>
References: <20190308085803.16516-1-fidencio@redhat.com>
Message-ID: <20190308095657.GW29693@natto.ory.fergeau.eu>
On Fri, Mar 08, 2019 at 09:58:03AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> Pushed as test-mediauris fix
Post-push Acked-by: Christophe Fergeau then ;)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Fri Mar 8 09:57:15 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 8 Mar 2019 10:57:15 +0100
Subject: [Libosinfo] [PATCH] ubuntu14.04: Add desktop installer script
to desktop medias
In-Reply-To: <20190308090643.19202-1-fidencio@redhat.com>
References: <20190308090643.19202-1-fidencio@redhat.com>
Message-ID: <20190308095715.GX29693@natto.ory.fergeau.eu>
On Fri, Mar 08, 2019 at 10:06:43AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> After realising that 14.04 is still going on, I gave an
> express-installation a try for the desktop profile (for the desktop
> medias) and it just works as expected!
Why not put this in the commit log though?
> ---
> data/os/ubuntu.com/ubuntu-14.04.xml.in | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> index dccb815..11e9d9e 100644
> --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> @@ -59,6 +59,9 @@
>
> casper/vmlinuz
> casper/initrd.lz
> +
> +
> +
>
>
> http://releases.ubuntu.com/14.04/ubuntu-14.04.6-desktop-amd64.iso
> @@ -67,6 +70,9 @@
>
> casper/vmlinuz.efi
> casper/initrd.lz
> +
> +
> +
>
>
>
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Fri Mar 8 10:28:25 2019
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 8 Mar 2019 11:28:25 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH] readme: Add json-glib as
dependency
In-Reply-To: <20190308093919.26362-1-fidencio@redhat.com>
References: <20190308093919.26362-1-fidencio@redhat.com>
Message-ID: <20190308102825.GY29693@natto.ory.fergeau.eu>
Sure,
Acked-by: Christophe Fergeau
On Fri, Mar 08, 2019 at 10:39:19AM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> README | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/README b/README
> index 411ceb2..b0faebb 100644
> --- a/README
> +++ b/README
> @@ -19,6 +19,7 @@ Dependencies
> - Required:
> - gobject-2.0
> - gio-2.0
> + - json-glib
> - libarchive3
> - libxml-2.0
> - libxslt-1.0
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From crobinso at redhat.com Fri Mar 8 18:43:45 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 8 Mar 2019 13:43:45 -0500
Subject: [Libosinfo] osinfo_entity param vs gobject property
Message-ID: <8e0bd146-07e8-b219-fdce-ffec7064ba12@redhat.com>
I'm a bit confused about the suggested way to extend bits of the
libosinfo API. Here's my current understanding:
We have osinfo_entity*param* functions. This is used internally to store
basically all XML string field data. To get a string field the API user
can do:
osinfo_entity_get_param_value(OSINFO_ENTITY(foo), KEY)
KEY will be a public C macro pointing to a string. A few examples:
#define OSINFO_PRODUCT_PROP_EOL_DATE "eol-date"
#define OSINFO_TREE_PROP_TREEINFO_FAMILY "treeinfo-family"
#define OSINFO_OS_PROP_FAMILY "family"
These macros are also used for passing to filter add_constraint
functions. This param data is what the filter APIs will actually filter on.
We also have gobject properties. This is all the internal PROP_FOO
macros, GParamSpec usage. All properties seem to just map to an entity
param value internally, so it's just an alternate access method. Many
entity params are not exposed as properties, like eol-date and family above.
We also have accessor functions. These are public API that return the
entity param values, possibly with some tweaks. eol-date above has
osinfo_product_get_eol_date_string which converts the string to a glib
date, treeinfo-family has osinfo_tree_get_treeinfo_family, but 'family'
doesn't have one.
So, when adding a new osinfo entity param, my questions are:
- What's the criteria for adding a gobject property to match?
- What's the criteria for adding an accessor function?
- What's the benefit of using osinfo_entity params instead of the
gobject property system which seems much more flexible and well
established? (besides the fact that I assume we are stuck with this for
back compat reasons)
- Cole
From berrange at redhat.com Mon Mar 11 09:43:38 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 11 Mar 2019 09:43:38 +0000
Subject: [Libosinfo] osinfo_entity param vs gobject property
In-Reply-To: <8e0bd146-07e8-b219-fdce-ffec7064ba12@redhat.com>
References: <8e0bd146-07e8-b219-fdce-ffec7064ba12@redhat.com>
Message-ID: <20190311094338.GD12393@redhat.com>
On Fri, Mar 08, 2019 at 01:43:45PM -0500, Cole Robinson wrote:
> I'm a bit confused about the suggested way to extend bits of the
> libosinfo API. Here's my current understanding:
>
> We have osinfo_entity*param* functions. This is used internally to store
> basically all XML string field data. To get a string field the API user
> can do:
>
> osinfo_entity_get_param_value(OSINFO_ENTITY(foo), KEY)
>
> KEY will be a public C macro pointing to a string. A few examples:
>
> #define OSINFO_PRODUCT_PROP_EOL_DATE "eol-date"
> #define OSINFO_TREE_PROP_TREEINFO_FAMILY "treeinfo-family"
> #define OSINFO_OS_PROP_FAMILY "family"
>
> These macros are also used for passing to filter add_constraint
> functions. This param data is what the filter APIs will actually filter on.
>
> We also have gobject properties. This is all the internal PROP_FOO
> macros, GParamSpec usage. All properties seem to just map to an entity
> param value internally, so it's just an alternate access method. Many
> entity params are not exposed as properties, like eol-date and family above.
>
> We also have accessor functions. These are public API that return the
> entity param values, possibly with some tweaks. eol-date above has
> osinfo_product_get_eol_date_string which converts the string to a glib
> date, treeinfo-family has osinfo_tree_get_treeinfo_family, but 'family'
> doesn't have one.
>
>
> So, when adding a new osinfo entity param, my questions are:
>
> - What's the criteria for adding a gobject property to match?
> - What's the criteria for adding an accessor function?
> - What's the benefit of using osinfo_entity params instead of the
> gobject property system which seems much more flexible and well
> established? (besides the fact that I assume we are stuck with this for
> back compat reasons)
The key difference between an entity parameters vs a gobject property
is that entity parameters are always arrays of strings. By convention
for some of the entity parametrs we'll only honour a single value, and
in such cases might expose them as GObject parameters.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From fidencio at redhat.com Mon Mar 11 10:38:55 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 11 Mar 2019 11:38:55 +0100
Subject: [Libosinfo] [libosinfo/osinfo-db PATCH 0/4] centos: Live medias
fixes
Message-ID: <20190311103859.784-1-fidencio@redhat.com>
In this series you can find a small amount of fixes related to the live
medias we have in our db.
Those fixes consist in:
- Improving the regex for matching the currently volume-id of LiveGNOME
medias
- A new test case for this has been also added to libosinfo tests
- Marking all the Live medias we have listed as not suitable for
unattended installations
- Fixing the kernel/initrd path for the Live medias
osinfo-db:
Fabiano Fid?ncio (3):
centos7.0: Tune the volume-id regex for LiveGNOME medias
centos: Mark live medias as not suitable for unattended installations
centos6.x: Fix kernel/initrd path for Live medias
data/os/centos.org/centos-6.10.xml.in | 12 ++++++------
data/os/centos.org/centos-6.3.xml.in | 6 +++---
data/os/centos.org/centos-6.7.xml.in | 24 ++++++++++++------------
data/os/centos.org/centos-6.8.xml.in | 24 ++++++++++++------------
data/os/centos.org/centos-6.9.xml.in | 12 ++++++------
data/os/centos.org/centos-7.0.xml.in | 6 +++---
6 files changed, 42 insertions(+), 42 deletions(-)
libosinfo:
Fabiano Fid?ncio (1):
isodata,centos: Add a new LiveGNOME isodata
...S-7-x86_64-LiveGNOME-new-volume-id.iso.txt | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 tests/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-new-volume-id.iso.txt
--
2.20.1
From fidencio at redhat.com Mon Mar 11 10:38:56 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 11 Mar 2019 11:38:56 +0100
Subject: [Libosinfo] [osinfo-db PATCH 1/4] centos7.0: Tune the volume-id
regex for LiveGNOME medias
In-Reply-To: <20190311103859.784-1-fidencio@redhat.com>
References: <20190311103859.784-1-fidencio@redhat.com>
Message-ID: <20190311103859.784-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/centos.org/centos-7.0.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index 7fc6d8d..b3a6bbc 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -35,7 +35,7 @@
https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso
LINUX
- CentOS-7-x86_64-LiveGNOME*
+ CentOS-7-x86_64-(Live)?GNOME*
isolinux/vmlinuz0
isolinux/initrd0.img
--
2.20.1
From fidencio at redhat.com Mon Mar 11 10:38:57 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 11 Mar 2019 11:38:57 +0100
Subject: [Libosinfo] [osinfo-db PATCH 2/4] centos: Mark live medias as not
suitable for unattended installations
In-Reply-To: <20190311103859.784-1-fidencio@redhat.com>
References: <20190311103859.784-1-fidencio@redhat.com>
Message-ID: <20190311103859.784-3-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/centos.org/centos-6.10.xml.in | 4 ++--
data/os/centos.org/centos-6.3.xml.in | 2 +-
data/os/centos.org/centos-6.7.xml.in | 8 ++++----
data/os/centos.org/centos-6.8.xml.in | 8 ++++----
data/os/centos.org/centos-6.9.xml.in | 4 ++--
data/os/centos.org/centos-7.0.xml.in | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/data/os/centos.org/centos-6.10.xml.in b/data/os/centos.org/centos-6.10.xml.in
index bf98ba8..3dccacd 100644
--- a/data/os/centos.org/centos-6.10.xml.in
+++ b/data/os/centos.org/centos-6.10.xml.in
@@ -35,7 +35,7 @@
-
+
LINUX
CentOS-6.10-i386-LiveDVD
@@ -44,7 +44,7 @@
isolinux/vmlinuz
isolinux/initrd.img
-
+
LINUX
CentOS-6.10-x86_64-LiveDVD
diff --git a/data/os/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in
index 371ade2..fbc1e2a 100644
--- a/data/os/centos.org/centos-6.3.xml.in
+++ b/data/os/centos.org/centos-6.3.xml.in
@@ -30,7 +30,7 @@
isolinux/vmlinuz
isolinux/initrd.img
-
+
LINUX
CentOS-6.3-x86_64-LiveDVD
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index 2041e76..4a2b959 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -35,7 +35,7 @@
-
+
LINUX
CentOS-6.7-i386-LiveCD
@@ -43,7 +43,7 @@
isolinux/vmlinuz
isolinux/initrd.img
-
+
LINUX
CentOS-6.7-x86_64-LiveCD
@@ -53,7 +53,7 @@
-
+
LINUX
CentOS-6.7-i386-LiveDVD
@@ -61,7 +61,7 @@
isolinux/vmlinuz
isolinux/initrd.img
-
+
LINUX
CentOS-6.7-x86_64-LiveDVD
diff --git a/data/os/centos.org/centos-6.8.xml.in b/data/os/centos.org/centos-6.8.xml.in
index 0c84297..85ea906 100644
--- a/data/os/centos.org/centos-6.8.xml.in
+++ b/data/os/centos.org/centos-6.8.xml.in
@@ -35,7 +35,7 @@
-
+
LINUX
CentOS-6.8-i386-LiveCD
@@ -43,7 +43,7 @@
isolinux/vmlinuz
isolinux/initrd.img
-
+
LINUX
CentOS-6.8-x86_64-LiveCD
@@ -53,7 +53,7 @@
-
+
LINUX
CentOS-6.8-i386-LiveDVD
@@ -62,7 +62,7 @@
isolinux/vmlinuz
isolinux/initrd.img
-
+
LINUX
CentOS-6.8-x86_64-LiveDVD
diff --git a/data/os/centos.org/centos-6.9.xml.in b/data/os/centos.org/centos-6.9.xml.in
index 93e03af..39a3c6e 100644
--- a/data/os/centos.org/centos-6.9.xml.in
+++ b/data/os/centos.org/centos-6.9.xml.in
@@ -35,7 +35,7 @@
-
+
LINUX
CentOS-6.9-i386-LiveDVD
@@ -44,7 +44,7 @@
isolinux/vmlinuz
isolinux/initrd.img
-
+
LINUX
CentOS-6.9-x86_64-LiveDVD
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index b3a6bbc..5a3b65d 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -30,7 +30,7 @@
isolinux/initrd.img
-
+
https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso
@@ -41,7 +41,7 @@
isolinux/initrd0.img
-
+
https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveKDE.iso
--
2.20.1
From fidencio at redhat.com Mon Mar 11 10:38:58 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 11 Mar 2019 11:38:58 +0100
Subject: [Libosinfo] [osinfo-db PATCH 3/4] centos6.x: Fix kernel/initrd path
for Live medias
In-Reply-To: <20190311103859.784-1-fidencio@redhat.com>
References: <20190311103859.784-1-fidencio@redhat.com>
Message-ID: <20190311103859.784-4-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/centos.org/centos-6.10.xml.in | 8 ++++----
data/os/centos.org/centos-6.3.xml.in | 4 ++--
data/os/centos.org/centos-6.7.xml.in | 16 ++++++++--------
data/os/centos.org/centos-6.8.xml.in | 16 ++++++++--------
data/os/centos.org/centos-6.9.xml.in | 8 ++++----
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/data/os/centos.org/centos-6.10.xml.in b/data/os/centos.org/centos-6.10.xml.in
index 3dccacd..04378a7 100644
--- a/data/os/centos.org/centos-6.10.xml.in
+++ b/data/os/centos.org/centos-6.10.xml.in
@@ -41,8 +41,8 @@
CentOS-6.10-i386-LiveDVD
2012102656
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
@@ -50,8 +50,8 @@
CentOS-6.10-x86_64-LiveDVD
2040971264
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
diff --git a/data/os/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in
index fbc1e2a..9816d23 100644
--- a/data/os/centos.org/centos-6.3.xml.in
+++ b/data/os/centos.org/centos-6.3.xml.in
@@ -35,8 +35,8 @@
LINUX
CentOS-6.3-x86_64-LiveDVD
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index 4a2b959..f45bac4 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -40,16 +40,16 @@
LINUX
CentOS-6.7-i386-LiveCD
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
LINUX
CentOS-6.7-x86_64-LiveCD
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
@@ -58,16 +58,16 @@
LINUX
CentOS-6.7-i386-LiveDVD
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
LINUX
CentOS-6.7-x86_64-LiveDVD
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
diff --git a/data/os/centos.org/centos-6.8.xml.in b/data/os/centos.org/centos-6.8.xml.in
index 85ea906..284f843 100644
--- a/data/os/centos.org/centos-6.8.xml.in
+++ b/data/os/centos.org/centos-6.8.xml.in
@@ -40,16 +40,16 @@
LINUX
CentOS-6.8-i386-LiveCD
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
LINUX
CentOS-6.8-x86_64-LiveCD
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
@@ -59,8 +59,8 @@
CentOS-6.8-i386-LiveDVD
1990477824
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
@@ -68,8 +68,8 @@
CentOS-6.8-x86_64-LiveDVD
2011746304
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
diff --git a/data/os/centos.org/centos-6.9.xml.in b/data/os/centos.org/centos-6.9.xml.in
index 39a3c6e..a586eb6 100644
--- a/data/os/centos.org/centos-6.9.xml.in
+++ b/data/os/centos.org/centos-6.9.xml.in
@@ -41,8 +41,8 @@
CentOS-6.9-i386-LiveDVD
2001133568
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
@@ -50,8 +50,8 @@
CentOS-6.9-x86_64-LiveDVD
2023274496
- isolinux/vmlinuz
- isolinux/initrd.img
+ isolinux/vmlinuz0
+ isolinux/initrd0.img
--
2.20.1
From fidencio at redhat.com Mon Mar 11 10:38:59 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 11 Mar 2019 11:38:59 +0100
Subject: [Libosinfo] [libosinfo PATCH 4/4] isodata,
centos: Add a new LiveGNOME isodata
In-Reply-To: <20190311103859.784-1-fidencio@redhat.com>
References: <20190311103859.784-1-fidencio@redhat.com>
Message-ID: <20190311103859.784-5-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
...S-7-x86_64-LiveGNOME-new-volume-id.iso.txt | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 tests/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-new-volume-id.iso.txt
diff --git a/tests/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-new-volume-id.iso.txt b/tests/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-new-volume-id.iso.txt
new file mode 100644
index 0000000..664fc3b
--- /dev/null
+++ b/tests/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-new-volume-id.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: CentOS-7-x86_64-GNOME-1902-01
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+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: 697091
+El Torito VD version 1 found, boot catalog is in sector 36
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 25 37
--
2.20.1
From crobinso at redhat.com Mon Mar 11 22:59:46 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Mon, 11 Mar 2019 18:59:46 -0400
Subject: [Libosinfo] [libosinfo/osinfo-db PATCH 0/4] centos: Live medias
fixes
In-Reply-To: <20190311103859.784-1-fidencio@redhat.com>
References: <20190311103859.784-1-fidencio@redhat.com>
Message-ID: <81462338-1aa5-398e-81fe-131c81468a48@redhat.com>
On 3/11/19 6:38 AM, Fabiano Fid?ncio wrote:
> In this series you can find a small amount of fixes related to the live
> medias we have in our db.
>
> Those fixes consist in:
> - Improving the regex for matching the currently volume-id of LiveGNOME
> medias
> - A new test case for this has been also added to libosinfo tests
> - Marking all the Live medias we have listed as not suitable for
> unattended installations
> - Fixing the kernel/initrd path for the Live medias
>
> osinfo-db:
> Fabiano Fid?ncio (3):
> centos7.0: Tune the volume-id regex for LiveGNOME medias
> centos: Mark live medias as not suitable for unattended installations
> centos6.x: Fix kernel/initrd path for Live medias
>
> data/os/centos.org/centos-6.10.xml.in | 12 ++++++------
> data/os/centos.org/centos-6.3.xml.in | 6 +++---
> data/os/centos.org/centos-6.7.xml.in | 24 ++++++++++++------------
> data/os/centos.org/centos-6.8.xml.in | 24 ++++++++++++------------
> data/os/centos.org/centos-6.9.xml.in | 12 ++++++------
> data/os/centos.org/centos-7.0.xml.in | 6 +++---
> 6 files changed, 42 insertions(+), 42 deletions(-)
>
> libosinfo:
> Fabiano Fid?ncio (1):
> isodata,centos: Add a new LiveGNOME isodata
>
> ...S-7-x86_64-LiveGNOME-new-volume-id.iso.txt | 29 +++++++++++++++++++
> 1 file changed, 29 insertions(+)
> create mode 100644 tests/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-new-volume-id.iso.txt
>
I was confused by the 6.X changes not touching every version, but I see
we are missing livecd metadata for some versions.
Reviewed-by: Cole Robinson
- Cole
From fidencio at redhat.com Tue Mar 12 10:20:22 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:22 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 00/25] Add tree information for RHEL
Message-ID: <20190312102047.15027-1-fidencio@redhat.com>
This patch series adds tree information for all RHEL releases from 6.0,
including some fixes in rhel-8 and rhel-8 regex for treeinfo's version
or media's volume-id.
I've taken the path of adding the most generic info about the trees
rather than adding each one of the variants, following Cole's
suggestion.
- Changes since v1:
https://www.redhat.com/archives/libosinfo/2019-February/msg00181.html
- Dropped the variants bits
- Changed the arch from i386 to i686
- Anchored all the treeinfo versions
Fabiano Fid?ncio (25):
rhel-6.0: Add tree information
rhel-6.1: Add tree information
rhel-6.2: Add tree information
rhel-6.3: Add tree information
rhel-6.4: Add tree information
rhel-6.5: Add tree information
rhel-6.6: Add tree information
rhel-6.7: Add tree information
rhel-6.8: Add tree information
rhel-6.9: Add tree information
rhel-6.10: Add tree information
rhel-7.0: Add tree information
rhel-7.1: Add tree information
rhel-7.2: Add tree information
rhel-7.3: Add tree information
rhel-7.4: Add tree information
rhel-7.5: Anchor the treeinfo version
rhel-7.5: Add tree information
rhel-7.6: Anchor the treeinfo version
rhel-7.6: Add tree information
rhel-7-unknown: Add tree information
rhel-8: Adjust version regex for x86_64 treeinfo
rhel-8.0: Add tree information
rhel-8-unknown: Adjust the regex for the volume id
rhel-8-unknown: Add tree information
data/os/redhat.com/rhel-6.0.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.1.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.10.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.2.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.3.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.4.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.5.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.6.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.7.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.8.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-6.9.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-7-unknown.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-7.0.xml.in | 24 ++++++++++++++
data/os/redhat.com/rhel-7.1.xml.in | 24 ++++++++++++++
data/os/redhat.com/rhel-7.2.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-7.3.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-7.4.xml.in | 32 +++++++++++++++++++
data/os/redhat.com/rhel-7.5.xml.in | 26 ++++++++++++++-
data/os/redhat.com/rhel-7.6.xml.in | 26 ++++++++++++++-
data/os/redhat.com/rhel-8-unknown.xml.in | 40 +++++++++++++++++++++---
data/os/redhat.com/rhel-8.0.xml.in | 34 +++++++++++++++++++-
21 files changed, 647 insertions(+), 7 deletions(-)
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:23 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:23 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 01/25] rhel-6.0: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.0.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in
index 3029712..1164184 100644
--- a/data/os/redhat.com/rhel-6.0.xml.in
+++ b/data/os/redhat.com/rhel-6.0.xml.in
@@ -44,6 +44,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.0$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.0$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.0$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.0$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:24 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:24 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 02/25] rhel-6.1: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-3-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.1.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.1.xml.in b/data/os/redhat.com/rhel-6.1.xml.in
index dda363e..0d73078 100644
--- a/data/os/redhat.com/rhel-6.1.xml.in
+++ b/data/os/redhat.com/rhel-6.1.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.1$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.1$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.1$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.1$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:25 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:25 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 03/25] rhel-6.2: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-4-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.2.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.2.xml.in b/data/os/redhat.com/rhel-6.2.xml.in
index dec3549..d8497d6 100644
--- a/data/os/redhat.com/rhel-6.2.xml.in
+++ b/data/os/redhat.com/rhel-6.2.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.2$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.2$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.2$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.2$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:26 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:26 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 04/25] rhel-6.3: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-5-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.3.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.3.xml.in b/data/os/redhat.com/rhel-6.3.xml.in
index 374daf1..cacd5ae 100644
--- a/data/os/redhat.com/rhel-6.3.xml.in
+++ b/data/os/redhat.com/rhel-6.3.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.3$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.3$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.3$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.3$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:27 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:27 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 05/25] rhel-6.4: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-6-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.4.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.4.xml.in b/data/os/redhat.com/rhel-6.4.xml.in
index 4d827c5..5acd236 100644
--- a/data/os/redhat.com/rhel-6.4.xml.in
+++ b/data/os/redhat.com/rhel-6.4.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.4$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.4$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.4$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.4$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:28 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:28 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 06/25] rhel-6.5: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-7-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.5.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.5.xml.in b/data/os/redhat.com/rhel-6.5.xml.in
index c736dad..e406ecd 100644
--- a/data/os/redhat.com/rhel-6.5.xml.in
+++ b/data/os/redhat.com/rhel-6.5.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.5$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.5$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.5$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.5$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:29 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:29 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 07/25] rhel-6.6: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-8-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.6.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.6.xml.in b/data/os/redhat.com/rhel-6.6.xml.in
index f281aaf..5c1001c 100644
--- a/data/os/redhat.com/rhel-6.6.xml.in
+++ b/data/os/redhat.com/rhel-6.6.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.6$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.6$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.6$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.6$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:30 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:30 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 08/25] rhel-6.7: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-9-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.7.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.7.xml.in b/data/os/redhat.com/rhel-6.7.xml.in
index a3b2e38..9e8ef32 100644
--- a/data/os/redhat.com/rhel-6.7.xml.in
+++ b/data/os/redhat.com/rhel-6.7.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.7$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.7$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.7$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.7$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:31 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:31 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 09/25] rhel-6.8: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-10-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.8.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.8.xml.in b/data/os/redhat.com/rhel-6.8.xml.in
index b3bc6fa..b2bd3c1 100644
--- a/data/os/redhat.com/rhel-6.8.xml.in
+++ b/data/os/redhat.com/rhel-6.8.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.8$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.8$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.8$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.8$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:32 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:32 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 10/25] rhel-6.9: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-11-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.9.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.9.xml.in b/data/os/redhat.com/rhel-6.9.xml.in
index ef769f9..b060c84 100644
--- a/data/os/redhat.com/rhel-6.9.xml.in
+++ b/data/os/redhat.com/rhel-6.9.xml.in
@@ -32,6 +32,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.9$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.9$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.9$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.9$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:33 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:33 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 11/25] rhel-6.10: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-12-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-6.10.xml.in | 32 +++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-6.10.xml.in b/data/os/redhat.com/rhel-6.10.xml.in
index b46b7b9..0cfec00 100644
--- a/data/os/redhat.com/rhel-6.10.xml.in
+++ b/data/os/redhat.com/rhel-6.10.xml.in
@@ -48,6 +48,38 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^6.10$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.10$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.10$
+ i386
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^6.10$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:34 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:34 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 12/25] rhel-7.0: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-13-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.0.xml.in | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index 1c79e35..c1850e5 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -44,6 +44,30 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^7.0$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.0$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.0$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:35 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:35 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 13/25] rhel-7.1: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-14-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.1.xml.in | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
index 8a43acf..cb8c635 100644
--- a/data/os/redhat.com/rhel-7.1.xml.in
+++ b/data/os/redhat.com/rhel-7.1.xml.in
@@ -32,6 +32,30 @@
isolinux/initrd.img
+
+
+ Red Hat Enterprise Linux
+ ^7.1$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.1$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.1$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:36 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:36 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 14/25] rhel-7.2: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-15-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.2.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 7cdae3b..4d167c1 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -65,6 +65,38 @@
+
+
+ Red Hat Enterprise Linux
+ ^7.2$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.2$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.2$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.2$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:37 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:37 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 15/25] rhel-7.3: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-16-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.3.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-7.3.xml.in b/data/os/redhat.com/rhel-7.3.xml.in
index 4418af7..147c294 100644
--- a/data/os/redhat.com/rhel-7.3.xml.in
+++ b/data/os/redhat.com/rhel-7.3.xml.in
@@ -51,6 +51,38 @@
+
+
+ Red Hat Enterprise Linux
+ ^7.3$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.3$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.3$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.3$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:38 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:38 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 16/25] rhel-7.4: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-17-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.4.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-7.4.xml.in b/data/os/redhat.com/rhel-7.4.xml.in
index 72bb357..cdc33a1 100644
--- a/data/os/redhat.com/rhel-7.4.xml.in
+++ b/data/os/redhat.com/rhel-7.4.xml.in
@@ -51,6 +51,38 @@
+
+
+ Red Hat Enterprise Linux
+ ^7.4$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.4$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.4$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.4$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:39 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:39 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 17/25] rhel-7.5: Anchor the
treeinfo version
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-18-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.5.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/os/redhat.com/rhel-7.5.xml.in b/data/os/redhat.com/rhel-7.5.xml.in
index 6dea055..2eaa163 100644
--- a/data/os/redhat.com/rhel-7.5.xml.in
+++ b/data/os/redhat.com/rhel-7.5.xml.in
@@ -54,7 +54,7 @@
Red Hat Enterprise Linux
- 7.5
+ ^7.5$
x86_64
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:40 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:40 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 18/25] rhel-7.5: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-19-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.5.xml.in | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/data/os/redhat.com/rhel-7.5.xml.in b/data/os/redhat.com/rhel-7.5.xml.in
index 2eaa163..f31e6c5 100644
--- a/data/os/redhat.com/rhel-7.5.xml.in
+++ b/data/os/redhat.com/rhel-7.5.xml.in
@@ -51,6 +51,30 @@
+
+
+ Red Hat Enterprise Linux
+ ^7.5$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.5$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.5$
+ s390x
+
+
+
Red Hat Enterprise Linux
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:41 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:41 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 19/25] rhel-7.6: Anchor the
treeinfo version
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-20-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.6.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in
index 1098c77..38ffeea 100644
--- a/data/os/redhat.com/rhel-7.6.xml.in
+++ b/data/os/redhat.com/rhel-7.6.xml.in
@@ -54,7 +54,7 @@
Red Hat Enterprise Linux
- 7.6
+ ^7.6$
x86_64
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:42 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:42 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 20/25] rhel-7.6: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-21-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7.6.xml.in | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in
index 38ffeea..615cecd 100644
--- a/data/os/redhat.com/rhel-7.6.xml.in
+++ b/data/os/redhat.com/rhel-7.6.xml.in
@@ -51,6 +51,30 @@
+
+
+ Red Hat Enterprise Linux
+ ^7.6$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.6$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.6$
+ s390x
+
+
+
Red Hat Enterprise Linux
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:43 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:43 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 21/25] rhel-7-unknown: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-22-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7-unknown.xml.in | 32 ++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-7-unknown.xml.in b/data/os/redhat.com/rhel-7-unknown.xml.in
index c436887..c0be24a 100644
--- a/data/os/redhat.com/rhel-7-unknown.xml.in
+++ b/data/os/redhat.com/rhel-7-unknown.xml.in
@@ -49,6 +49,38 @@
+
+
+ Red Hat Enterprise Linux
+ ^7.([7-9]|[1-9][0-9])$
+ ppc64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.([7-9]|[1-9][0-9])$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.([7-9]|[1-9][0-9])$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^7.([7-9]|[1-9][0-9])$
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:44 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:44 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 22/25] rhel-8: Adjust version regex
for x86_64 treeinfo
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-23-fidencio@redhat.com>
Let's make it match *only* with 8.0, avoiding it to match with 8.0.0
(for instance).
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-8.0.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index 119c146..28bdde0 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -71,7 +71,7 @@
Red Hat Enterprise Linux
- 8.0
+ ^8.0$
x86_64
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:45 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:45 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 23/25] rhel-8.0: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-24-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-8.0.xml.in | 32 ++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index 28bdde0..7dfef6e 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -68,6 +68,30 @@
+
+
+ Red Hat Enterprise Linux
+ 8.0$
+ aarch64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^8.0$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^8.0$
+ s390x
+
+
+
Red Hat Enterprise Linux
@@ -76,6 +100,14 @@
+
+
+ Red Hat Enterprise Linux
+ ^8.0$
+ aarch64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:46 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:46 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 24/25] rhel-8-unknown: Adjust the
regex for the volume id
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-25-fidencio@redhat.com>
Currently our regex consider cases as 8-x with x > 0.
Although the case shown above has still to be considered, we also have
to consider: 8-x-y, with x >= 0 and y >= 0.
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-8-unknown.xml.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/os/redhat.com/rhel-8-unknown.xml.in b/data/os/redhat.com/rhel-8-unknown.xml.in
index 7367038..8882940 100644
--- a/data/os/redhat.com/rhel-8-unknown.xml.in
+++ b/data/os/redhat.com/rhel-8-unknown.xml.in
@@ -15,7 +15,7 @@
LINUX
- .*RHEL-8-([1-9]|[1-9][0-9]).*x86_64.*
+ .*RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*x86_64.*
isolinux/vmlinuz
isolinux/initrd.img
@@ -24,21 +24,21 @@
LINUX
- RHEL-8-([1-9]|[1-9][0-9]).*aarch64$
+ RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*aarch64$
PPC
- RHEL[_-]8[_-]([1-9]|[1-9][0-9]).*ppc64le$
+ RHEL[_-]8[_-](([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])[_-]([0-9]|[1-9][0-9]))).*ppc64le$
LINUX
- RHEL-8-([1-9]|[1-9][0-9]).*s390x$
+ RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*s390x$
--
2.20.1
From fidencio at redhat.com Tue Mar 12 10:20:47 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 12 Mar 2019 11:20:47 +0100
Subject: [Libosinfo] [osinfo-db PATCH v2 25/25] rhel-8-unknown: Add tree
information
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID: <20190312102047.15027-26-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-8-unknown.xml.in | 32 ++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-8-unknown.xml.in b/data/os/redhat.com/rhel-8-unknown.xml.in
index 8882940..3bb6f98 100644
--- a/data/os/redhat.com/rhel-8-unknown.xml.in
+++ b/data/os/redhat.com/rhel-8-unknown.xml.in
@@ -42,6 +42,38 @@
+
+
+ Red Hat Enterprise Linux
+ ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$
+ aarch64
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$
+ ppc64le
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$
+ s390x
+
+
+
+
+
+ Red Hat Enterprise Linux
+ ^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$
+ x86_64
+
+
+
1
--
2.20.1
From crobinso at redhat.com Tue Mar 12 14:26:09 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 12 Mar 2019 10:26:09 -0400
Subject: [Libosinfo] [osinfo-db PATCH v2 00/25] Add tree information for
RHEL
In-Reply-To: <20190312102047.15027-1-fidencio@redhat.com>
References: <20190312102047.15027-1-fidencio@redhat.com>
Message-ID:
On 3/12/19 6:20 AM, Fabiano Fid?ncio wrote:
> This patch series adds tree information for all RHEL releases from 6.0,
> including some fixes in rhel-8 and rhel-8 regex for treeinfo's version
> or media's volume-id.
>
> I've taken the path of adding the most generic info about the trees
> rather than adding each one of the variants, following Cole's
> suggestion.
>
> - Changes since v1:
> https://www.redhat.com/archives/libosinfo/2019-February/msg00181.html
> - Dropped the variants bits
> - Changed the arch from i386 to i686
> - Anchored all the treeinfo versions
>
> Fabiano Fid?ncio (25):
> rhel-6.0: Add tree information
> rhel-6.1: Add tree information
> rhel-6.2: Add tree information
> rhel-6.3: Add tree information
> rhel-6.4: Add tree information
> rhel-6.5: Add tree information
> rhel-6.6: Add tree information
> rhel-6.7: Add tree information
> rhel-6.8: Add tree information
> rhel-6.9: Add tree information
> rhel-6.10: Add tree information
> rhel-7.0: Add tree information
> rhel-7.1: Add tree information
> rhel-7.2: Add tree information
> rhel-7.3: Add tree information
> rhel-7.4: Add tree information
> rhel-7.5: Anchor the treeinfo version
> rhel-7.5: Add tree information
> rhel-7.6: Anchor the treeinfo version
> rhel-7.6: Add tree information
> rhel-7-unknown: Add tree information
> rhel-8: Adjust version regex for x86_64 treeinfo
> rhel-8.0: Add tree information
> rhel-8-unknown: Adjust the regex for the volume id
> rhel-8-unknown: Add tree information
>
Reviewed-by: Cole Robinson
- Cole
From fidencio at redhat.com Wed Mar 13 20:44:26 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 13 Mar 2019 21:44:26 +0100
Subject: [Libosinfo] [osinfo-db PATCH 0/4] RFC: Add basic tests for osinfo-db
Message-ID: <20190313204430.16677-1-fidencio@redhat.com>
This series introduces 3 basic tests for osinfo-db that currently are
part of libosinfo.
The tests chosen for this initial work are the test-*.uris. The
short-term plan is to move test-isodetect here as well, removing them
the need of updating libosinfo tests for each new entry added to
osinfo-db.
As osinfo-db doesn't rely on autotools, some hacks have been in the
Makefile in order to keep one log file per test.
Fabiano Fid?ncio (4):
Makefile: Split xmllint from check
tests: Add media tests
tests: Add tree tests
tests: Add image tests
.gitignore | 5 ++-
Makefile | 20 ++++++++--
tests/unit/__init__.py | 0
tests/unit/osinfo.py | 81 ++++++++++++++++++++++++++++++++++++++++
tests/unit/test_image.py | 20 ++++++++++
tests/unit/test_media.py | 20 ++++++++++
tests/unit/test_tree.py | 20 ++++++++++
tests/unit/util.py | 37 ++++++++++++++++++
8 files changed, 199 insertions(+), 4 deletions(-)
create mode 100644 tests/unit/__init__.py
create mode 100644 tests/unit/osinfo.py
create mode 100644 tests/unit/test_image.py
create mode 100644 tests/unit/test_media.py
create mode 100644 tests/unit/test_tree.py
create mode 100644 tests/unit/util.py
--
2.20.1
From fidencio at redhat.com Wed Mar 13 20:44:27 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 13 Mar 2019 21:44:27 +0100
Subject: [Libosinfo] [osinfo-db PATCH 1/4] Makefile: Split xmllint from check
In-Reply-To: <20190313204430.16677-1-fidencio@redhat.com>
References: <20190313204430.16677-1-fidencio@redhat.com>
Message-ID: <20190313204430.16677-2-fidencio@redhat.com>
Let's have xmllint split from check so we can easily add more targets to
to the `make check`.
With the change `make lint` became an available make target as well.
Signed-off-by: Fabiano Fid?ncio
---
Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 329f409..1367de3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-
VPATH = .
ifdef SOURCE_DATE_EPOCH
@@ -51,7 +50,6 @@ INTLTOOL_MERGE_OPTS = $(INTLTOOL_MERGE_OPTS_$(V))
INTLTOOL_MERGE_OPTS_0 = -q
INTLTOOL_MERGE_OPTS_1 =
-
all: $(ARCHIVE) osinfo-db.spec mingw-osinfo-db.spec
install: $(ARCHIVE)
@@ -120,10 +118,11 @@ update-po:
fi; \
done
-check: $(DATA_FILES) $(SCHEMA_FILES)
+lint: $(DATA_FILES) $(SCHEMA_FILES)
for xml in `find data -name '*.xml' | sort`; do \
if ! $(XMLLINT) --relaxng data/schema/osinfo.rng --noout $$xml; then \
exit 1; \
fi; \
done
+check: lint
--
2.20.1
From fidencio at redhat.com Wed Mar 13 20:44:28 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 13 Mar 2019 21:44:28 +0100
Subject: [Libosinfo] [osinfo-db PATCH 2/4] tests: Add media tests
In-Reply-To: <20190313204430.16677-1-fidencio@redhat.com>
References: <20190313204430.16677-1-fidencio@redhat.com>
Message-ID: <20190313204430.16677-3-fidencio@redhat.com>
Media tests, at least for now, consist only in the equivalent of
test-mediauris.c from libosinfo and behaves in the same way, being
executed only if OSINFO_DB_NETWORK_TESTS is set.
Signed-off-by: Fabiano Fid?ncio
---
.gitignore | 5 ++++-
Makefile | 17 ++++++++++++++-
tests/unit/__init__.py | 0
tests/unit/osinfo.py | 45 ++++++++++++++++++++++++++++++++++++++++
tests/unit/test_media.py | 20 ++++++++++++++++++
tests/unit/util.py | 37 +++++++++++++++++++++++++++++++++
6 files changed, 122 insertions(+), 2 deletions(-)
create mode 100644 tests/unit/__init__.py
create mode 100644 tests/unit/osinfo.py
create mode 100644 tests/unit/test_media.py
create mode 100644 tests/unit/util.py
diff --git a/.gitignore b/.gitignore
index 27200ed..0f17e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,11 @@ po/osinfo-db.pot
data/*/*/*.xml
data/*/*/*/*.xml
data/schema/osinfo.rng
+tests/*/__pycache__
+tests/*/*.log
+.pytest_cache
*~
#*
osinfo-db-*.tar.xz
osinfo-db.spec
-mingw-osinfo-db.spec
\ No newline at end of file
+mingw-osinfo-db.spec
diff --git a/Makefile b/Makefile
index 1367de3..d8e0f87 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,8 @@ GETTEXT_PACKAGE = osinfo-db
SED = sed
+TEE = tee
+
DATA_FILES_IN = $(wildcard $(VPATH)/data/*/*/*.xml.in) $(wildcard $(VPATH)/data/*/*/*/*.xml.in)
DATA_FILES = $(DATA_FILES_IN:$(VPATH)/%.in=%)
@@ -32,6 +34,8 @@ ZANATA = zanata
XMLLINT = xmllint
+PYTHON = python3
+
V = 0
V_I18N = $(V_I18N_$(V))
@@ -125,4 +129,15 @@ lint: $(DATA_FILES) $(SCHEMA_FILES)
fi; \
done
-check: lint
+unit-tests: $(DATA_FILES)
+ @command -v $(PYTHON) > /dev/null; \
+ if [ $$? -eq 0 ] ; then \
+ for file in tests/unit/test_*.py; do \
+ log_file=`echo $$file | $(SED) -e 's/\.py/.log/'`; \
+ INTERNAL_OSINFO_DB_DATA_DIR=data $(PYTHON) -m pytest -s $$file --log-level=info | $(TEE) $$log_file; \
+ done; \
+ else \
+ echo "unit-tests are not going to be executed as no $(PYTHON) has been found"; \
+ fi
+
+check: lint unit-tests
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/unit/osinfo.py b/tests/unit/osinfo.py
new file mode 100644
index 0000000..e54dc3c
--- /dev/null
+++ b/tests/unit/osinfo.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+
+import logging
+import requests
+from http.client import responses
+
+
+class Os():
+ def __init__(self, root):
+ self._root = root
+
+ def _get_medias(self):
+ medias = []
+ for media in self._root.findall('media'):
+ medias.append(Media(media))
+ return medias
+ medias = property(_get_medias)
+
+ def _get_shortid(self):
+ shortid = self._root.find('short-id')
+ return shortid.text
+ shortid = property(_get_shortid)
+
+
+class Media():
+ def __init__(self, root):
+ self._root = root
+
+ def _get_url(self):
+ url = self._root.find('url')
+ if url is not None:
+ return URL(url.text)
+ url = property(_get_url)
+
+
+class URL():
+ def __init__(self, url):
+ self._url = url
+
+ def check(self):
+ logging.info("url: %s" % self._url)
+ response = requests.head(self._url, allow_redirects=True)
+ logging.info("response: %s; code: %d" %
+ (responses[response.status_code], response.status_code))
+ return response.ok
diff --git a/tests/unit/test_media.py b/tests/unit/test_media.py
new file mode 100644
index 0000000..f779aaa
--- /dev/null
+++ b/tests/unit/test_media.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+import os
+import pytest
+from . import util
+
+
+class TestMedia():
+ oses = util.oses()
+
+ def os_id(os):
+ return os.shortid
+
+ @pytest.mark.parametrize('os', [*oses], ids=os_id)
+ @pytest.mark.skipif(os.environ.get('OSINFO_DB_NETWORK_TESTS') is None,
+ reason='Network related tests are not enabled')
+ def test_media_url(self, os):
+ for media in os.medias:
+ if media.url:
+ assert(media.url.check())
diff --git a/tests/unit/util.py b/tests/unit/util.py
new file mode 100644
index 0000000..cdb657e
--- /dev/null
+++ b/tests/unit/util.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+import logging
+import os
+import sys
+import xml.etree.ElementTree as ET
+
+from . import osinfo
+
+def _get_files(directory):
+ files = []
+ datadir = os.environ.get('INTERNAL_OSINFO_DB_DATA_DIR')
+ if datadir is not None:
+ root = os.path.join(datadir, directory)
+ for (dirpath, _, filenames) in os.walk(root):
+ for filename in filenames:
+ if not filename.endswith('.xml'):
+ continue
+ files.append(os.path.join(dirpath, filename))
+ else:
+ logging.error('INTERNAL_OSINFO_DB_DATA_DIR is not set')
+ return files
+
+def _get_os(path):
+ tree = ET.parse(path)
+ root = tree.getroot()
+
+ os = root.find('os')
+ return os
+
+def oses():
+ oses = []
+ files = _get_files('os')
+ if files:
+ for f in files:
+ oses.append(osinfo.Os(_get_os(f)))
+ return oses
--
2.20.1
From fidencio at redhat.com Wed Mar 13 20:44:29 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 13 Mar 2019 21:44:29 +0100
Subject: [Libosinfo] [osinfo-db PATCH 3/4] tests: Add tree tests
In-Reply-To: <20190313204430.16677-1-fidencio@redhat.com>
References: <20190313204430.16677-1-fidencio@redhat.com>
Message-ID: <20190313204430.16677-4-fidencio@redhat.com>
Tree tests, at least for now, consist only in the equivalent of
test-treeuris.c from libosinfo and behaves in the same way, being
executed only if OSINFO_DB_NETWORK_TESTS is set.
Signed-off-by: Fabiano Fid?ncio
---
tests/unit/osinfo.py | 18 ++++++++++++++++++
tests/unit/test_tree.py | 20 ++++++++++++++++++++
2 files changed, 38 insertions(+)
create mode 100644 tests/unit/test_tree.py
diff --git a/tests/unit/osinfo.py b/tests/unit/osinfo.py
index e54dc3c..1d90c16 100644
--- a/tests/unit/osinfo.py
+++ b/tests/unit/osinfo.py
@@ -16,6 +16,13 @@ class Os():
return medias
medias = property(_get_medias)
+ def _get_trees(self):
+ trees = []
+ for tree in self._root.findall('tree'):
+ trees.append(Tree(tree))
+ return trees
+ trees = property(_get_trees)
+
def _get_shortid(self):
shortid = self._root.find('short-id')
return shortid.text
@@ -33,6 +40,17 @@ class Media():
url = property(_get_url)
+class Tree():
+ def __init__(self, root):
+ self._root = root
+
+ def _get_url(self):
+ url = self._root.find('url')
+ if url is not None:
+ return URL(url.text)
+ url = property(_get_url)
+
+
class URL():
def __init__(self, url):
self._url = url
diff --git a/tests/unit/test_tree.py b/tests/unit/test_tree.py
new file mode 100644
index 0000000..3802407
--- /dev/null
+++ b/tests/unit/test_tree.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+import os
+import pytest
+from . import util
+
+
+class TestTree():
+ oses = util.oses()
+
+ def os_id(os):
+ return os.shortid
+
+ @pytest.mark.parametrize('os', [*oses], ids=os_id)
+ @pytest.mark.skipif(os.environ.get('OSINFO_DB_NETWORK_TESTS') is None,
+ reason='Network related tests are not enabled')
+ def test_tree_url(self, os):
+ for tree in os.trees:
+ if tree.url:
+ assert(tree.url.check())
--
2.20.1
From fidencio at redhat.com Wed Mar 13 20:44:30 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 13 Mar 2019 21:44:30 +0100
Subject: [Libosinfo] [osinfo-db PATCH 4/4] tests: Add image tests
In-Reply-To: <20190313204430.16677-1-fidencio@redhat.com>
References: <20190313204430.16677-1-fidencio@redhat.com>
Message-ID: <20190313204430.16677-5-fidencio@redhat.com>
Image tests, at least for now, consist only in the equivalent of
test-imageuris.c from libosinfo and behaves in the same way, being
executed only if OSINFO_DB_NETWORK_TESTS is set.
Signed-off-by: Fabiano Fid?ncio
---
tests/unit/osinfo.py | 18 ++++++++++++++++++
tests/unit/test_image.py | 20 ++++++++++++++++++++
2 files changed, 38 insertions(+)
create mode 100644 tests/unit/test_image.py
diff --git a/tests/unit/osinfo.py b/tests/unit/osinfo.py
index 1d90c16..b2d14c9 100644
--- a/tests/unit/osinfo.py
+++ b/tests/unit/osinfo.py
@@ -9,6 +9,13 @@ class Os():
def __init__(self, root):
self._root = root
+ def _get_images(self):
+ images = []
+ for image in self._root.findall('image'):
+ images.append(Image(image))
+ return images
+ images = property(_get_images)
+
def _get_medias(self):
medias = []
for media in self._root.findall('media'):
@@ -29,6 +36,17 @@ class Os():
shortid = property(_get_shortid)
+class Image():
+ def __init__(self, root):
+ self._root = root
+
+ def _get_url(self):
+ url = self._root.find('url')
+ if url is not None:
+ return URL(url.text)
+ url = property(_get_url)
+
+
class Media():
def __init__(self, root):
self._root = root
diff --git a/tests/unit/test_image.py b/tests/unit/test_image.py
new file mode 100644
index 0000000..7524c86
--- /dev/null
+++ b/tests/unit/test_image.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+import os
+import pytest
+from . import util
+
+
+class TestImage():
+ oses = util.oses()
+
+ def os_id(os):
+ return os.shortid
+
+ @pytest.mark.parametrize('os', [*oses], ids=os_id)
+ @pytest.mark.skipif(os.environ.get('OSINFO_DB_NETWORK_TESTS') is None,
+ reason='Network related tests are not enabled')
+ def test_image_url(self, os):
+ for image in os.images:
+ if image.url:
+ assert(image.url.check())
--
2.20.1
From fidencio at redhat.com Fri Mar 15 09:15:48 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 10:15:48 +0100
Subject: [Libosinfo] [osinfo-db 0/4] Small fixes caught while implementing
osinfo-db tests
Message-ID: <20190315091552.1894-1-fidencio@redhat.com>
While adding the tests to osinfo-db I got to fix those in order to have
everything working as expected there.
For the netbsd and centos patches, I'm not exactly sure why those where
not caught before by the libosinfo tests, but figuring that out at this
point is not worth it, as the tests are going to be removed in favour of
the (coming soon) osinfo-db tests.
Fabiano Fid?ncio (4):
asianux-7.2: Remove empty system-id tag
asiaunix-unknown: Simplify the volume-id regex
netbsd-7.1: Anchor volume-ids
centos-6.6/centos-6.7: Fix volume-size of the medias
data/os/asianux.com/asianux-7.2.xml.in | 1 -
data/os/asianux.com/asianux-unknown.xml.in | 2 +-
data/os/centos.org/centos-6.6.xml.in | 12 ++++++------
data/os/centos.org/centos-6.7.xml.in | 12 ++++++------
data/os/netbsd.org/netbsd-7.1.xml.in | 12 ++++++------
5 files changed, 19 insertions(+), 20 deletions(-)
--
2.20.1
From fidencio at redhat.com Fri Mar 15 09:15:49 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 10:15:49 +0100
Subject: [Libosinfo] [osinfo-db 1/4] asianux-7.2: Remove empty system-id tag
In-Reply-To: <20190315091552.1894-1-fidencio@redhat.com>
References: <20190315091552.1894-1-fidencio@redhat.com>
Message-ID: <20190315091552.1894-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/asianux.com/asianux-7.2.xml.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/os/asianux.com/asianux-7.2.xml.in b/data/os/asianux.com/asianux-7.2.xml.in
index 69219fd..b27d0b9 100644
--- a/data/os/asianux.com/asianux-7.2.xml.in
+++ b/data/os/asianux.com/asianux-7.2.xml.in
@@ -15,7 +15,6 @@
-
Asianux Server 7 SP2 x86_64
isolinux/vmlinuz
--
2.20.1
From fidencio at redhat.com Fri Mar 15 09:15:50 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 10:15:50 +0100
Subject: [Libosinfo] [osinfo-db 2/4] asiaunix-unknown: Simplify the
volume-id regex
In-Reply-To: <20190315091552.1894-1-fidencio@redhat.com>
References: <20190315091552.1894-1-fidencio@redhat.com>
Message-ID: <20190315091552.1894-3-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/asianux.com/asianux-unknown.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/os/asianux.com/asianux-unknown.xml.in b/data/os/asianux.com/asianux-unknown.xml.in
index 8618eab..95d9508 100644
--- a/data/os/asianux.com/asianux-unknown.xml.in
+++ b/data/os/asianux.com/asianux-unknown.xml.in
@@ -13,7 +13,7 @@
LINUX
- Asianux Server 7 (?!SP[12]).+|Asianux Server 4 (?!SP[67]).+).+
+ Asianux Server (7 (?!SP[12])|(4 ?!SP[67])).+
isolinux/vmlinuz
isolinux/initrd.img
--
2.20.1
From fidencio at redhat.com Fri Mar 15 09:15:51 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 10:15:51 +0100
Subject: [Libosinfo] [osinfo-db 3/4] netbsd-7.1: Anchor volume-ids
In-Reply-To: <20190315091552.1894-1-fidencio@redhat.com>
References: <20190315091552.1894-1-fidencio@redhat.com>
Message-ID: <20190315091552.1894-4-fidencio@redhat.com>
Otherwise we can have 7.1 medias matching with 7.1.x medias.
Signed-off-by: Fabiano Fid?ncio
---
data/os/netbsd.org/netbsd-7.1.xml.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/os/netbsd.org/netbsd-7.1.xml.in b/data/os/netbsd.org/netbsd-7.1.xml.in
index 5cd4833..fee3425 100644
--- a/data/os/netbsd.org/netbsd-7.1.xml.in
+++ b/data/os/netbsd.org/netbsd-7.1.xml.in
@@ -16,7 +16,7 @@
https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-amd64.iso
NetBSD
- NETBSD_71
+ ^NETBSD_71$
390959104
@@ -24,7 +24,7 @@
https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot.iso
NetBSD
- NETBSD_71
+ ^NETBSD_71$
85082112
@@ -32,7 +32,7 @@
https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot-com.iso
NetBSD
- NETBSD_71
+ ^NETBSD_71$
85082112
@@ -40,7 +40,7 @@
https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-i386.iso
NetBSD
- NETBSD_71
+ ^NETBSD_71$
425703424
@@ -48,7 +48,7 @@
https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot.iso
NetBSD
- NETBSD_71
+ ^NETBSD_71$
89937920
@@ -56,7 +56,7 @@
https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot-com.iso
NetBSD
- NETBSD_71
+ ^NETBSD_71$
89937920
--
2.20.1
From fidencio at redhat.com Fri Mar 15 09:15:52 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 10:15:52 +0100
Subject: [Libosinfo] [osinfo-db 4/4] centos-6.6/centos-6.7: Fix volume-size
of the medias
In-Reply-To: <20190315091552.1894-1-fidencio@redhat.com>
References: <20190315091552.1894-1-fidencio@redhat.com>
Message-ID: <20190315091552.1894-5-fidencio@redhat.com>
The volume-size of the 6.6 and 6.7 medias were taken as the ISO size
showed when downloading the ISOs, instead of using the block size *
volume size from the ISO.
Signed-off-by: Fabiano Fid?ncio
---
data/os/centos.org/centos-6.6.xml.in | 12 ++++++------
data/os/centos.org/centos-6.7.xml.in | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/data/os/centos.org/centos-6.6.xml.in b/data/os/centos.org/centos-6.6.xml.in
index 9018b2a..5ba5172 100644
--- a/data/os/centos.org/centos-6.6.xml.in
+++ b/data/os/centos.org/centos-6.6.xml.in
@@ -19,7 +19,7 @@
LINUX
CentOS_6.6_Final
- 4029677568
+ 4029048832
isolinux/vmlinuz
isolinux/initrd.img
@@ -28,7 +28,7 @@
LINUX
CentOS_6.6_Final
- 4632608768
+ 4631738368
isolinux/vmlinuz
isolinux/initrd.img
@@ -39,7 +39,7 @@
LINUX
CentOS_6.6_Final
- 355467264
+ 355250176
isolinux/vmlinuz
isolinux/initrd.img
@@ -48,7 +48,7 @@
LINUX
CentOS_6.6_Final
- 401604608
+ 400891904
isolinux/vmlinuz
isolinux/initrd.img
@@ -59,7 +59,7 @@
LINUX
CentOS
- 190840832
+ 189818880
isolinux/vmlinuz
isolinux/initrd.img
@@ -68,7 +68,7 @@
LINUX
CentOS
- 232783872
+ 232714240
isolinux/vmlinuz
isolinux/initrd.img
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index f45bac4..d9dc4c0 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -19,7 +19,7 @@
LINUX
CentOS_6.7_Final
- 3786407936
+ 3786326016
isolinux/vmlinuz
isolinux/initrd.img
@@ -28,7 +28,7 @@
LINUX
CentOS_6.7_Final
- 3895459840
+ 3894714368
isolinux/vmlinuz
isolinux/initrd.img
@@ -75,7 +75,7 @@
LINUX
CentOS_6.7_Final
- 367001600
+ 366696448
isolinux/vmlinuz
isolinux/initrd.img
@@ -84,7 +84,7 @@
LINUX
CentOS_6.7_Final
- 414187520
+ 413882368
isolinux/vmlinuz
isolinux/initrd.img
@@ -95,7 +95,7 @@
LINUX
CentOS
- 196083712
+ 195758080
isolinux/vmlinuz
isolinux/initrd.img
@@ -104,7 +104,7 @@
LINUX
CentOS
- 241172480
+ 240156672
isolinux/vmlinuz
isolinux/initrd.img
--
2.20.1
From fidencio at redhat.com Fri Mar 15 14:43:40 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 15:43:40 +0100
Subject: [Libosinfo] [osinfo-db 3/4] netbsd-7.1: Anchor volume-ids
In-Reply-To: <20190315091552.1894-4-fidencio@redhat.com>
References: <20190315091552.1894-1-fidencio@redhat.com>
<20190315091552.1894-4-fidencio@redhat.com>
Message-ID:
On Fri, Mar 15, 2019 at 10:16 AM Fabiano Fid?ncio wrote:
>
> Otherwise we can have 7.1 medias matching with 7.1.x medias.
Well, we wouldn't, because of the volume-size.
Seems that my test was actually not taking the volume-size into
account (which was fixed later on and caught the issues in the 4th
patch of this series).
So, please, ignore this one!
From fidencio at redhat.com Fri Mar 15 15:51:14 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 16:51:14 +0100
Subject: [Libosinfo] [osinfo-db 0/2] RFC: Add basic tests for osinfo-db
(Part II)
Message-ID: <20190315155116.26184-1-fidencio@redhat.com>
This series, built atop of
https://www.redhat.com/archives/libosinfo/2019-March/msg00145.html,
introduces a test for media detection, similar to test-isodetect from
libosinfo.
I'm pretty sure these patches (including the ones from Part I) could
have been written in a more pythonic way but, well, changes can be done
later on.
With Part I and Part II we can get rid of the libosinfo tests that are
dependent on osinfo-db data.
Fabiano Fid?ncio (2):
tests: Add the isodata from libosinfo
test_media: Add detection test
.../alpine-extended-3.5.0-x86.iso.txt | 29 +++++++
.../alpine-extended-3.5.0-x86_64.iso.txt | 29 +++++++
.../alpine-extended-3.5.1-x86.iso.txt | 29 +++++++
.../alpine-extended-3.5.1-x86_64.iso.txt | 29 +++++++
.../alpine-extended-3.5.2-x86.iso.txt | 29 +++++++
.../alpine-extended-3.5.2-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.5.0-x86.iso.txt | 29 +++++++
.../alpine-standard-3.5.0-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.5.1-x86.iso.txt | 29 +++++++
.../alpine-standard-3.5.1-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.5.2-x86.iso.txt | 29 +++++++
.../alpine-standard-3.5.2-x86_64.iso.txt | 29 +++++++
.../alpine-vanilla-3.5.0-x86.iso.txt | 29 +++++++
.../alpine-vanilla-3.5.0-x86_64.iso.txt | 29 +++++++
.../alpine-vanilla-3.5.1-x86.iso.txt | 29 +++++++
.../alpine-vanilla-3.5.1-x86_64.iso.txt | 29 +++++++
.../alpine-vanilla-3.5.2-x86.iso.txt | 29 +++++++
.../alpine-vanilla-3.5.2-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.5.0-x86.iso.txt | 29 +++++++
.../alpine-virt-3.5.0-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.5.1-x86.iso.txt | 29 +++++++
.../alpine-virt-3.5.1-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.5.2-x86.iso.txt | 29 +++++++
.../alpine-virt-3.5.2-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.5.0-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.5.1-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.5.2-x86_64.iso.txt | 29 +++++++
.../alpine-extended-3.6.0-x86.iso.txt | 29 +++++++
.../alpine-extended-3.6.0-x86_64.iso.txt | 29 +++++++
.../alpine-extended-3.6.1-x86.iso.txt | 29 +++++++
.../alpine-extended-3.6.1-x86_64.iso.txt | 29 +++++++
.../alpine-extended-3.6.2-x86.iso.txt | 29 +++++++
.../alpine-extended-3.6.2-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.6.0-x86.iso.txt | 29 +++++++
.../alpine-standard-3.6.0-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.6.1-x86.iso.txt | 29 +++++++
.../alpine-standard-3.6.1-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.6.2-x86.iso.txt | 29 +++++++
.../alpine-standard-3.6.2-x86_64.iso.txt | 29 +++++++
.../alpine-vanilla-3.6.0-x86.iso.txt | 29 +++++++
.../alpine-vanilla-3.6.0-x86_64.iso.txt | 29 +++++++
.../alpine-vanilla-3.6.1-x86.iso.txt | 29 +++++++
.../alpine-vanilla-3.6.1-x86_64.iso.txt | 29 +++++++
.../alpine-vanilla-3.6.2-x86.iso.txt | 29 +++++++
.../alpine-vanilla-3.6.2-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.6.0-x86.iso.txt | 29 +++++++
.../alpine-virt-3.6.0-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.6.1-x86.iso.txt | 29 +++++++
.../alpine-virt-3.6.1-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.6.2-x86.iso.txt | 29 +++++++
.../alpine-virt-3.6.2-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.6.0-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.6.1-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.6.2-x86_64.iso.txt | 29 +++++++
.../alpine-extended-3.7.0-x86.iso.txt | 29 +++++++
.../alpine-extended-3.7.0-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.7.0-x86.iso.txt | 29 +++++++
.../alpine-standard-3.7.0-x86_64.iso.txt | 29 +++++++
.../alpine-vanilla-3.7.0-ppc64le.iso.txt | 16 ++++
.../alpine-vanilla-3.7.0-x86.iso.txt | 29 +++++++
.../alpine-vanilla-3.7.0-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.7.0-x86.iso.txt | 29 +++++++
.../alpine-virt-3.7.0-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.7.0-x86_64.iso.txt | 29 +++++++
.../alpine-extended-3.8.1-x86.iso.txt | 29 +++++++
.../alpine-extended-3.8.1-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.8.0-ppc64le.iso.txt | 16 ++++
.../alpine-standard-3.8.0-s390x.iso.txt | 29 +++++++
.../alpine-standard-3.8.0-x86.iso.txt | 29 +++++++
.../alpine-standard-3.8.0-x86_64.iso.txt | 29 +++++++
.../alpine-standard-3.8.1-ppc64le.iso.txt | 16 ++++
.../alpine-standard-3.8.1-s390x.iso.txt | 29 +++++++
.../alpine-standard-3.8.1-x86.iso.txt | 29 +++++++
.../alpine-standard-3.8.1-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.8.0-x86.iso.txt | 29 +++++++
.../alpine-virt-3.8.0-x86_64.iso.txt | 29 +++++++
.../alpine-virt-3.8.1-x86.iso.txt | 29 +++++++
.../alpine-virt-3.8.1-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.8.0-x86_64.iso.txt | 29 +++++++
.../alpine-xen-3.8.1-x86_64.iso.txt | 29 +++++++
.../alt-p8-builder-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-builder-20180912-x86_64.iso.txt | 29 +++++++
.../alt-p8-cinnamon-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-cinnamon-20180912-x86_64.iso.txt | 29 +++++++
...alt-p8-enlightenment-20180912-i586.iso.txt | 29 +++++++
...t-p8-enlightenment-20180912-x86_64.iso.txt | 29 +++++++
.../alt-p8-gnome3-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-gnome3-20180912-x86_64.iso.txt | 29 +++++++
.../alt-p8-gnustep-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-gnustep-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-icewm-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-icewm-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-jeos-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-jeos-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-kde4-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-kde4-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-kde5-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-kde5-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-lxde-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-lxde-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-lxqt-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-lxqt-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-mate-20180913-i586.iso.txt | 29 +++++++
.../alt-p8-mate-20180913-x86_64.iso.txt | 29 +++++++
.../alt-p8-rescue-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-rescue-20180912-x86_64.iso.txt | 29 +++++++
.../alt-p8-server-20180913-i586.iso.txt | 29 +++++++
.../alt-p8-server-20180913-x86_64.iso.txt | 29 +++++++
.../alt-p8-server-pve-20180912-x86_64.iso.txt | 29 +++++++
.../alt-p8-sysv-tde-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-sysv-tde-20180912-x86_64.iso.txt | 29 +++++++
.../alt-p8-sysv-xfce-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-sysv-xfce-20180912-x86_64.iso.txt | 29 +++++++
.../alt-p8-wmaker-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-wmaker-20180912-x86_64.iso.txt | 29 +++++++
.../alt.p8/alt-p8-xfce-20180912-i586.iso.txt | 29 +++++++
.../alt-p8-xfce-20180912-x86_64.iso.txt | 29 +++++++
.../regular-cinnamon-20181017-i586.iso.txt | 29 +++++++
.../regular-cinnamon-20181017-x86_64.iso.txt | 29 +++++++
...egular-enlightenment-20181017-i586.iso.txt | 29 +++++++
...ular-enlightenment-20181017-x86_64.iso.txt | 29 +++++++
.../regular-gnome3-20181017-i586.iso.txt | 29 +++++++
.../regular-gnome3-20181017-x86_64.iso.txt | 29 +++++++
.../regular-gnustep-20181017-i586.iso.txt | 29 +++++++
.../regular-gnustep-20181017-x86_64.iso.txt | 29 +++++++
.../regular-icewm-20181017-i586.iso.txt | 29 +++++++
.../regular-icewm-20181017-x86_64.iso.txt | 29 +++++++
.../regular-jeos-20181017-i586.iso.txt | 29 +++++++
.../regular-jeos-20181017-x86_64.iso.txt | 29 +++++++
.../regular-kde5-20181017-i586.iso.txt | 29 +++++++
.../regular-kde5-20181017-x86_64.iso.txt | 29 +++++++
.../regular-lxde-20181017-i586.iso.txt | 29 +++++++
.../regular-lxde-20181017-x86_64.iso.txt | 29 +++++++
.../regular-lxqt-20181017-i586.iso.txt | 29 +++++++
.../regular-lxqt-20181017-x86_64.iso.txt | 29 +++++++
.../regular-mate-20181017-i586.iso.txt | 29 +++++++
.../regular-mate-20181017-x86_64.iso.txt | 29 +++++++
.../regular-rescue-20181017-i586.iso.txt | 29 +++++++
.../regular-rescue-20181017-x86_64.iso.txt | 29 +++++++
.../regular-wmaker-20181017-i586.iso.txt | 29 +++++++
.../regular-wmaker-20181017-x86_64.iso.txt | 29 +++++++
.../regular-xfce-20181017-i586.iso.txt | 29 +++++++
.../regular-xfce-20181017-x86_64.iso.txt | 29 +++++++
.../alt8.0/alt-education-8.0-i586.iso.txt | 29 +++++++
.../alt8.0/alt-education-8.0-x86_64.iso.txt | 29 +++++++
.../alt-kworkstation-8.1-install-i586.iso.txt | 29 +++++++
...lt-kworkstation-8.1-install-x86_64.iso.txt | 29 +++++++
.../alt-kworkstation-8.1-live-i586.iso.txt | 29 +++++++
.../alt-kworkstation-8.1-live-x86_64.iso.txt | 29 +++++++
.../alt8.1/alt-workstation-8.1-i586.iso.txt | 29 +++++++
.../alt8.1/alt-workstation-8.1-x86_64.iso.txt | 29 +++++++
.../alt-kworkstation-8.2-install-i586.iso.txt | 29 +++++++
...lt-kworkstation-8.2-install-x86_64.iso.txt | 29 +++++++
.../alt-kworkstation-8.2-live-i586.iso.txt | 29 +++++++
.../alt-kworkstation-8.2-live-x86_64.iso.txt | 29 +++++++
.../alt8.2/alt-server-8.2-i586.iso.txt | 29 +++++++
.../alt8.2/alt-server-8.2-x86_64.iso.txt | 29 +++++++
.../alt8.2/alt-simply-8.2.0-i586.iso.txt | 29 +++++++
.../alt8.2/alt-simply-8.2.0-live-i586.iso.txt | 29 +++++++
.../alt-simply-8.2.0-live-x86_64.iso.txt | 29 +++++++
.../alt8.2/alt-simply-8.2.0-x86_64.iso.txt | 29 +++++++
.../alt8.2/alt-workstation-8.2-i586.iso.txt | 29 +++++++
.../alt8.2/alt-workstation-8.2-x86_64.iso.txt | 29 +++++++
.../Master-2.4-install-DVD.iso.txt | 29 +++++++
.../altlinux2.4/Master-2.4-install-cd.iso.txt | 29 +++++++
.../altlinux3.0/compact-3.0.4.iso.txt | 29 +++++++
.../altlinux3.0/installer-3.0.4.iso.txt | 29 +++++++
.../altlinux3.0/travelcd-3.0.4.iso.txt | 29 +++++++
...altlinux-4.0.0-terminal-i586-en-cd.iso.txt | 29 +++++++
...ltlinux-4.0.0-terminal-i586-ru-dvd.iso.txt | 29 +++++++
...linux-4.0.1-server-i586-install-cd.iso.txt | 29 +++++++
...nux-4.0.1-server-x86_64-install-cd.iso.txt | 29 +++++++
...4.0.3-desktop-i586-install_en-dvd5.iso.txt | 29 +++++++
...4.0.3-desktop-i586-install_ru-dvd5.iso.txt | 29 +++++++
...4.0.3-desktop-i586-install_uk-dvd5.iso.txt | 29 +++++++
...inux-4.0.3-lite-i586-install_en-cd.iso.txt | 29 +++++++
...inux-4.0.3-lite-i586-install_ru-cd.iso.txt | 29 +++++++
...inux-4.0.3-lite-i586-install_uk-cd.iso.txt | 29 +++++++
...inux-4.1.1-desktop-i586-install-cd.iso.txt | 29 +++++++
...ux-4.1.1-desktop-i586-install-dvd5.iso.txt | 29 +++++++
...4.1.1-desktop-i586-install_en-dvd5.iso.txt | 29 +++++++
...ux-4.1.1-desktop-x86_64-install-cd.iso.txt | 29 +++++++
...-4.1.1-desktop-x86_64-install-dvd5.iso.txt | 29 +++++++
...0-ark-desktop-i586-ru-install-dvd5.iso.txt | 29 +++++++
...ark-desktop-x86_64-ru-install-dvd5.iso.txt | 29 +++++++
....0.0-ark-server-i586-ru-install-cd.iso.txt | 29 +++++++
....0-ark-server-x86_64-ru-install-cd.iso.txt | 29 +++++++
....0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 29 +++++++
....0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 29 +++++++
...school-junior-i586-ru-install-dvd5.iso.txt | 29 +++++++
...0.2-school-lite-i586-ru-install-cd.iso.txt | 29 +++++++
...school-master-i586-ru-install-dvd5.iso.txt | 29 +++++++
...school-server-i586-ru-install-dvd5.iso.txt | 29 +++++++
...hool-server-x86_64-ru-install-dvd5.iso.txt | 29 +++++++
...hool-terminal-i586-ru-install-dvd5.iso.txt | 29 +++++++
...0.0-centaurus-i586-ru-install-dvd5.iso.txt | 29 +++++++
...0-centaurus-x86_64-ru-install-dvd5.iso.txt | 29 +++++++
....0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 29 +++++++
....0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 29 +++++++
...-6.0.1-simply-i586-ru-install-dvd5.iso.txt | 29 +++++++
....0.1-simply-x86_64-ru-install-dvd5.iso.txt | 29 +++++++
...0.2-centaurus-i586-ru-install-dvd5.iso.txt | 29 +++++++
...5-centaurus-x86_64-ru-install-dvd5.iso.txt | 29 +++++++
.../android-x86-8.1-rc2.iso.txt | 29 +++++++
.../android-x86_64-8.1-rc2.iso.txt | 29 +++++++
.../archlinux-2019.02.01-x86_64.iso.txt | 29 +++++++
.../asianux4.6/asianux-4.6-i386.iso.txt | 29 +++++++
.../asianux4.6/asianux-4.6-x86_64.iso.txt | 29 +++++++
.../asianux4.7/asianux-4.7-i386.iso.txt | 29 +++++++
.../asianux4.7/asianux-4.7-x86_64.iso.txt | 29 +++++++
.../asianux/asianux7.0/asianux-7.0.iso.txt | 29 +++++++
.../asianux/asianux7.1/asianux-7.1.iso.txt | 29 +++++++
.../asianux/asianux7.2/asianux-7.2.iso.txt | 29 +++++++
.../centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt | 29 +++++++
.../CentOS-6.0-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.1-i386-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.1-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.10-i386-LiveDVD.iso.txt | 29 +++++++
.../CentOS-6.10-i386-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.10-i386-minimal.iso.txt | 29 +++++++
.../CentOS-6.10-i386-netinstall.iso.txt | 29 +++++++
.../CentOS-6.10-x86_64-LiveDVD.iso.txt | 29 +++++++
.../CentOS-6.10-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.10-x86_64-minimal.iso.txt | 29 +++++++
.../CentOS-6.10-x86_64-netinstall.iso.txt | 29 +++++++
.../CentOS-6.2-i386-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.2-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.3-i386-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.3-x86_64-LiveDVD.iso.txt | 29 +++++++
.../CentOS-6.3-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.4-i386-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.4-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.5-i386-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.5-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../centos6.6/CentOS-6.6-i386-bin-DVD1.iso | 29 +++++++
.../centos6.6/CentOS-6.6-i386-minimal.iso | 29 +++++++
.../centos6.6/CentOS-6.6-i386-netinstall.iso | 29 +++++++
.../centos6.6/CentOS-6.6-x86_64-bin-DVD1.iso | 29 +++++++
.../centos6.6/CentOS-6.6-x86_64-minimal.iso | 29 +++++++
.../CentOS-6.6-x86_64-netinstall.iso | 29 +++++++
.../centos6.7/CentOS-6.7-i386-LiveCD.iso | 29 +++++++
.../centos6.7/CentOS-6.7-i386-LiveDVD.iso | 29 +++++++
.../centos6.7/CentOS-6.7-i386-bin-DVD1.iso | 29 +++++++
.../centos6.7/CentOS-6.7-i386-minimal.iso | 29 +++++++
.../centos6.7/CentOS-6.7-i386-netinstall.iso | 29 +++++++
.../centos6.7/CentOS-6.7-x86_64-LiveCD.iso | 29 +++++++
.../centos6.7/CentOS-6.7-x86_64-LiveDVD.iso | 29 +++++++
.../centos6.7/CentOS-6.7-x86_64-bin-DVD1.iso | 29 +++++++
.../centos6.7/CentOS-6.7-x86_64-minimal.iso | 29 +++++++
.../CentOS-6.7-x86_64-netinstall.iso | 29 +++++++
.../centos6.8/CentOS-6.8-i386-LiveDVD.iso.txt | 29 +++++++
.../CentOS-6.8-i386-bin-DVD1.iso.txt | 29 +++++++
.../centos6.8/CentOS-6.8-i386-minimal.iso.txt | 29 +++++++
.../CentOS-6.8-i386-netinstall.iso.txt | 29 +++++++
.../CentOS-6.8-x86_64-LiveDVD.iso.txt | 29 +++++++
.../CentOS-6.8-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.8-x86_64-minimal.iso.txt | 29 +++++++
.../CentOS-6.8-x86_64-netinstall.iso.txt | 29 +++++++
.../centos6.9/CentOS-6.9-i386-LiveDVD.iso.txt | 29 +++++++
.../CentOS-6.9-i386-bin-DVD1.iso.txt | 29 +++++++
.../centos6.9/CentOS-6.9-i386-minimal.iso.txt | 29 +++++++
.../CentOS-6.9-i386-netinstall.iso.txt | 29 +++++++
.../CentOS-6.9-x86_64-LiveDVD.iso.txt | 29 +++++++
.../CentOS-6.9-x86_64-bin-DVD1.iso.txt | 29 +++++++
.../CentOS-6.9-x86_64-minimal.iso.txt | 29 +++++++
.../CentOS-6.9-x86_64-netinstall.iso.txt | 29 +++++++
.../centos7.0/CentOS-7-x86_64-DVD.iso.txt | 29 +++++++
.../CentOS-7-x86_64-Everything.iso.txt | 29 +++++++
.../CentOS-7-x86_64-LiveGNOME-1804.iso.txt | 29 +++++++
...S-7-x86_64-LiveGNOME-new-volume-id.iso.txt | 29 +++++++
.../CentOS-7-x86_64-LiveGNOME.iso.txt | 29 +++++++
.../CentOS-7-x86_64-LiveKDE-1804.iso.txt | 29 +++++++
.../centos7.0/CentOS-7-x86_64-LiveKDE.iso.txt | 29 +++++++
.../centos7.0/CentOS-7-x86_64-Minimal.iso.txt | 29 +++++++
.../CentOS-7-x86_64-NetInstall-1611.iso.txt | 29 +++++++
.../CentOS-7.0-1406-x86_64-DVD.iso.txt | 29 +++++++
.../CentOS-7.0-1406-x86_64-Everything.iso.txt | 29 +++++++
.../debian6/debian-6.0.10-i386-DVD-1.iso.txt | 17 ++++
.../debian6/debian-6.0.4-i386-CD-1.iso.txt | 29 +++++++
.../debian6/debian-6.0.8-amd64-CD-1.iso.txt | 29 +++++++
.../debian6/debian-6.0.8-i386-CD-1.iso.txt | 29 +++++++
.../debian-live-6.0.3-i386-standard.iso.txt | 29 +++++++
.../debian-live-6.0.8-amd64-standard.iso.txt | 29 +++++++
.../debian-live-6.0.8-i386-standard.iso.txt | 29 +++++++
.../debian7/debian-7.0.0-amd64-DVD-1.iso.txt | 29 +++++++
.../debian7/debian-7.0.0-i386-DVD-1.iso.txt | 29 +++++++
.../debian7/debian-7.2.0-amd64-DVD-1.iso.txt | 29 +++++++
.../debian7/debian-7.2.0-i386-DVD-1.iso.txt | 29 +++++++
.../debian7/debian-7.3.0-amd64-DVD-1.iso.txt | 29 +++++++
.../debian7/debian-7.3.0-i386-DVD-1.iso.txt | 29 +++++++
.../debian8/debian-8.0.0-amd64-CD-1.iso.txt | 29 +++++++
.../debian8/debian-8.7.1-amd64-CD-1.iso.txt | 29 +++++++
.../debian9/debian-9.0-amd64-netinst.iso.txt | 29 +++++++
.../debian/debian9/debian-9.0-amd64.iso.txt | 29 +++++++
.../debian9/debian-9.0-arm64-netinst.iso.txt | 29 +++++++
.../debian/debian9/debian-9.0-arm64.iso.txt | 29 +++++++
.../debian9/debian-9.0-armhf-netinst.iso.txt | 16 ++++
.../debian/debian9/debian-9.0-armhf.iso.txt | 16 ++++
.../debian9/debian-9.0-i386-netinst.iso.txt | 29 +++++++
.../debian/debian9/debian-9.0-i386.iso.txt | 29 +++++++
.../debian-testing-amd64-DVD-1.iso.txt | 29 +++++++
.../dfly-x86_64-5.0.0_REL.iso.txt | 33 ++++++++
.../dfly-x86_64-5.0.1_REL.iso.txt | 33 ++++++++
.../dfly-x86_64-5.0.2_REL.iso.txt | 33 ++++++++
.../dfly-x86_64-5.2.0_REL.iso.txt | 33 ++++++++
.../dfly-x86_64-5.2.1_REL.iso.txt | 33 ++++++++
.../dfly-x86_64-5.2.2_REL.iso.txt | 34 ++++++++
.../dfly-x86_64-5.4.0_REL.iso.txt | 29 +++++++
.../dfly-x86_64-5.4.1_REL.iso.txt | 29 +++++++
...3.4-amd64-amd64.180515-041823.base.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-044004.es.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-044248.bn.iso.txt | 29 +++++++
....4-amd64-amd64.180515-044927.es_GT.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-050141.en.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-054338.ar.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-055726.fr.iso.txt | 29 +++++++
....4-amd64-amd64.180515-061343.es_MX.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-062519.id.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-064146.th.iso.txt | 29 +++++++
...os3.4-amd64-amd64.180515-070619.vi.iso.txt | 29 +++++++
....4-amd64-amd64.180515-071821.zh_CN.iso.txt | 29 +++++++
.../fedora/fedora1/yarrow-i386-disc1.iso.txt | 29 +++++++
.../fedora/fedora1/yarrow-i386-disc2.iso.txt | 16 ++++
.../fedora/fedora1/yarrow-i386-disc3.iso.txt | 16 ++++
.../fedora/fedora1/yarrow-i386-dvd.iso.txt | 29 +++++++
.../fedora/fedora10/F10-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora/fedora10/F10-i686-Live.iso.txt | 29 +++++++
.../fedora10/F10-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora/fedora10/F10-x86_64-Live.iso.txt | 29 +++++++
.../fedora10/Fedora-10-i386-DVD.iso.txt | 29 +++++++
.../fedora10/Fedora-10-i386-disc1.iso.txt | 29 +++++++
.../fedora10/Fedora-10-i386-disc2.iso.txt | 16 ++++
.../fedora10/Fedora-10-i386-disc3.iso.txt | 16 ++++
.../fedora10/Fedora-10-i386-disc4.iso.txt | 16 ++++
.../fedora10/Fedora-10-i386-disc5.iso.txt | 16 ++++
.../fedora10/Fedora-10-i386-disc6.iso.txt | 16 ++++
.../fedora/fedora10/Fedora-10-ppc-DVD.iso.txt | 16 ++++
.../fedora10/Fedora-10-ppc-disc1.iso.txt | 16 ++++
.../fedora10/Fedora-10-ppc-disc2.iso.txt | 16 ++++
.../fedora10/Fedora-10-ppc-disc3.iso.txt | 16 ++++
.../fedora10/Fedora-10-ppc-disc4.iso.txt | 16 ++++
.../fedora10/Fedora-10-ppc-disc5.iso.txt | 16 ++++
.../fedora10/Fedora-10-ppc-disc6.iso.txt | 16 ++++
.../fedora10/Fedora-10-ppc-disc7.iso.txt | 16 ++++
.../fedora10/Fedora-10-x86_64-DVD.iso.txt | 29 +++++++
.../fedora10/Fedora-10-x86_64-disc1.iso.txt | 29 +++++++
.../fedora10/Fedora-10-x86_64-disc2.iso.txt | 16 ++++
.../fedora10/Fedora-10-x86_64-disc3.iso.txt | 16 ++++
.../fedora10/Fedora-10-x86_64-disc4.iso.txt | 16 ++++
.../fedora10/Fedora-10-x86_64-disc5.iso.txt | 16 ++++
.../fedora10/Fedora-10-x86_64-disc6.iso.txt | 16 ++++
.../fedora11/Fedora-11-i386-DVD.iso.txt | 29 +++++++
.../fedora11/Fedora-11-i386-disc1.iso.txt | 29 +++++++
.../fedora11/Fedora-11-i386-disc2.iso.txt | 16 ++++
.../fedora11/Fedora-11-i386-disc3.iso.txt | 16 ++++
.../fedora11/Fedora-11-i386-disc4.iso.txt | 16 ++++
.../fedora11/Fedora-11-i386-disc5.iso.txt | 16 ++++
.../fedora11/Fedora-11-i386-disc6.iso.txt | 16 ++++
.../fedora11/Fedora-11-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora11/Fedora-11-i686-Live.iso.txt | 29 +++++++
.../fedora/fedora11/Fedora-11-ppc-DVD.iso.txt | 16 ++++
.../fedora11/Fedora-11-ppc-disc1.iso.txt | 16 ++++
.../fedora11/Fedora-11-ppc-disc2.iso.txt | 16 ++++
.../fedora11/Fedora-11-ppc-disc3.iso.txt | 16 ++++
.../fedora11/Fedora-11-ppc-disc4.iso.txt | 16 ++++
.../fedora11/Fedora-11-ppc-disc5.iso.txt | 16 ++++
.../fedora11/Fedora-11-ppc-disc6.iso.txt | 16 ++++
.../fedora11/Fedora-11-ppc-disc7.iso.txt | 16 ++++
.../fedora11/Fedora-11-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-11-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora11/Fedora-11-x86_64-Live.iso.txt | 29 +++++++
.../fedora11/Fedora-11-x86_64-disc1.iso.txt | 29 +++++++
.../fedora11/Fedora-11-x86_64-disc2.iso.txt | 16 ++++
.../fedora11/Fedora-11-x86_64-disc3.iso.txt | 16 ++++
.../fedora11/Fedora-11-x86_64-disc4.iso.txt | 16 ++++
.../fedora11/Fedora-11-x86_64-disc5.iso.txt | 16 ++++
.../fedora11/Fedora-11-x86_64-disc6.iso.txt | 16 ++++
.../fedora12/Fedora-12-i386-DVD.iso.txt | 29 +++++++
.../fedora12/Fedora-12-i386-disc1.iso.txt | 29 +++++++
.../fedora12/Fedora-12-i386-disc2.iso.txt | 16 ++++
.../fedora12/Fedora-12-i386-disc3.iso.txt | 16 ++++
.../fedora12/Fedora-12-i386-disc4.iso.txt | 16 ++++
.../fedora12/Fedora-12-i386-disc5.iso.txt | 16 ++++
.../fedora12/Fedora-12-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora12/Fedora-12-i686-Live.iso.txt | 29 +++++++
.../fedora/fedora12/Fedora-12-ppc-DVD.iso.txt | 16 ++++
.../fedora12/Fedora-12-ppc-disc1.iso.txt | 16 ++++
.../fedora12/Fedora-12-ppc-disc2.iso.txt | 16 ++++
.../fedora12/Fedora-12-ppc-disc3.iso.txt | 16 ++++
.../fedora12/Fedora-12-ppc-disc4.iso.txt | 16 ++++
.../fedora12/Fedora-12-ppc-disc5.iso.txt | 16 ++++
.../fedora12/Fedora-12-ppc-disc6.iso.txt | 16 ++++
.../fedora12/Fedora-12-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-12-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora12/Fedora-12-x86_64-Live.iso.txt | 29 +++++++
.../fedora12/Fedora-12-x86_64-disc1.iso.txt | 29 +++++++
.../fedora12/Fedora-12-x86_64-disc2.iso.txt | 16 ++++
.../fedora12/Fedora-12-x86_64-disc3.iso.txt | 16 ++++
.../fedora12/Fedora-12-x86_64-disc4.iso.txt | 16 ++++
.../fedora12/Fedora-12-x86_64-disc5.iso.txt | 16 ++++
.../fedora13/Fedora-13-i386-DVD.iso.txt | 29 +++++++
.../fedora13/Fedora-13-i386-disc1.iso.txt | 29 +++++++
.../fedora13/Fedora-13-i386-disc2.iso.txt | 16 ++++
.../fedora13/Fedora-13-i386-disc3.iso.txt | 16 ++++
.../fedora13/Fedora-13-i386-disc4.iso.txt | 16 ++++
.../fedora13/Fedora-13-i386-disc5.iso.txt | 16 ++++
.../fedora13/Fedora-13-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora13/Fedora-13-i686-Live.iso.txt | 29 +++++++
.../fedora13/Fedora-13-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-13-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora13/Fedora-13-x86_64-Live.iso.txt | 29 +++++++
.../fedora13/Fedora-13-x86_64-disc1.iso.txt | 29 +++++++
.../fedora13/Fedora-13-x86_64-disc2.iso.txt | 16 ++++
.../fedora13/Fedora-13-x86_64-disc3.iso.txt | 16 ++++
.../fedora13/Fedora-13-x86_64-disc4.iso.txt | 16 ++++
.../fedora13/Fedora-13-x86_64-disc5.iso.txt | 16 ++++
.../fedora14/Fedora-14-i386-DVD.iso.txt | 29 +++++++
.../fedora14/Fedora-14-i386-disc1.iso.txt | 29 +++++++
.../fedora14/Fedora-14-i386-disc2.iso.txt | 16 ++++
.../fedora14/Fedora-14-i386-disc3.iso.txt | 16 ++++
.../fedora14/Fedora-14-i386-disc4.iso.txt | 16 ++++
.../fedora14/Fedora-14-i386-disc5.iso.txt | 16 ++++
.../Fedora-14-i686-Live-Desktop.iso.txt | 29 +++++++
.../fedora14/Fedora-14-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora14/Fedora-14-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-14-x86_64-Live-Desktop.iso.txt | 29 +++++++
.../Fedora-14-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora14/Fedora-14-x86_64-disc1.iso.txt | 29 +++++++
.../fedora14/Fedora-14-x86_64-disc2.iso.txt | 16 ++++
.../fedora14/Fedora-14-x86_64-disc3.iso.txt | 16 ++++
.../fedora14/Fedora-14-x86_64-disc4.iso.txt | 16 ++++
.../fedora14/Fedora-14-x86_64-disc5.iso.txt | 16 ++++
.../fedora15/Fedora-15-i386-DVD.iso.txt | 29 +++++++
.../Fedora-15-i686-Live-Desktop.iso.txt | 29 +++++++
.../fedora15/Fedora-15-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora15/Fedora-15-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-15-x86_64-Live-Desktop.iso.txt | 29 +++++++
.../Fedora-15-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora16/Fedora-16-i386-DVD.iso.txt | 29 +++++++
.../Fedora-16-i686-Live-Desktop.iso.txt | 29 +++++++
.../fedora16/Fedora-16-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora16/Fedora-16-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-16-x86_64-Live-Desktop.iso.txt | 29 +++++++
.../Fedora-16-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora17/Fedora-17-i386-DVD.iso.txt | 29 +++++++
.../Fedora-17-i686-Live-Desktop.iso.txt | 29 +++++++
.../fedora17/Fedora-17-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora17/Fedora-17-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-17-x86_64-Live-Desktop.iso.txt | 29 +++++++
.../Fedora-17-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora18/Fedora-18-i386-DVD.iso.txt | 29 +++++++
.../Fedora-18-i686-Live-Desktop.iso.txt | 29 +++++++
.../fedora18/Fedora-18-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora18/Fedora-18-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-18-x86_64-Live-Desktop.iso.txt | 29 +++++++
.../Fedora-18-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora19/Fedora-19-i386-netinst.iso.txt | 29 +++++++
.../fedora19/Fedora-19-x86_64-DVD.iso.txt | 29 +++++++
.../Fedora-Live-Desktop-i686-19-1.iso.txt | 29 +++++++
.../Fedora-Live-Desktop-x86_64-19-1.iso.txt | 29 +++++++
.../Fedora-Live-KDE-i686-19-1.iso.txt | 29 +++++++
.../Fedora-Live-KDE-x86_64-19-1.iso.txt | 29 +++++++
.../Fedora-Live-LXDE-x86_64-19-1.iso.txt | 29 +++++++
.../Fedora-Live-XFCE-x86_64-19-1.iso.txt | 29 +++++++
.../fedora/fedora2/FC2-i386-DVD.iso.txt | 29 +++++++
.../fedora/fedora2/FC2-i386-disc1.iso.txt | 29 +++++++
.../fedora/fedora2/FC2-i386-disc2.iso.txt | 16 ++++
.../fedora/fedora2/FC2-i386-disc3.iso.txt | 16 ++++
.../fedora/fedora2/FC2-i386-disc4.iso.txt | 16 ++++
.../fedora/fedora2/FC2-x86_64-DVD.iso.txt | 29 +++++++
.../fedora/fedora2/FC2-x86_64-disc1.iso.txt | 29 +++++++
.../fedora/fedora2/FC2-x86_64-disc2.iso.txt | 16 ++++
.../fedora/fedora2/FC2-x86_64-disc3.iso.txt | 16 ++++
.../fedora/fedora2/FC2-x86_64-disc4.iso.txt | 16 ++++
.../fedora20/Fedora-20-i386-DVD.iso.txt | 29 +++++++
.../fedora20/Fedora-20-i386-netinst.iso.txt | 29 +++++++
.../fedora20/Fedora-20-ppc64-netinst.iso.txt | 16 ++++
.../fedora20/Fedora-20-x86_64-DVD.iso.txt | 29 +++++++
.../fedora20/Fedora-20-x86_64-netinst.iso.txt | 29 +++++++
.../Fedora-Live-Desktop-i686-20-1.iso.txt | 29 +++++++
.../Fedora-Live-Desktop-x86_64-20-1.iso.txt | 29 +++++++
.../Fedora-Live-KDE-i686-20-1.iso.txt | 29 +++++++
.../Fedora-Live-KDE-x86_64-20-1.iso.txt | 29 +++++++
.../Fedora-Cloud-netinst-i386-21.iso.txt | 29 +++++++
.../Fedora-Cloud-netinst-x86_64-21.iso.txt | 29 +++++++
.../Fedora-Live-Workstation-i686-21-5.iso.txt | 29 +++++++
...edora-Live-Workstation-x86_64-21-5.iso.txt | 29 +++++++
.../Fedora-Server-DVD-i386-21.iso.txt | 29 +++++++
.../Fedora-Server-DVD-x86_64-21.iso.txt | 29 +++++++
.../Fedora-Server-netinst-i386-21.iso.txt | 29 +++++++
.../Fedora-Server-netinst-x86_64-21.iso.txt | 29 +++++++
.../Fedora-Live-Workstation-i686-22-3.iso.txt | 29 +++++++
...edora-Live-Workstation-x86_64-22-3.iso.txt | 29 +++++++
.../Fedora-Server-DVD-i386-22.iso.txt | 29 +++++++
.../Fedora-Server-DVD-x86_64-22.iso.txt | 29 +++++++
.../Fedora-Server-netinst-i386-22.iso.txt | 29 +++++++
.../Fedora-Server-netinst-x86_64-22.iso.txt | 29 +++++++
...Fedora-Workstation-netinst-i386-22.iso.txt | 29 +++++++
...dora-Workstation-netinst-x86_64-22.iso.txt | 29 +++++++
...ra-Live-Workstation-i686-23_Beta-1.iso.txt | 29 +++++++
...-Live-Workstation-x86_64-23_Beta-1.iso.txt | 29 +++++++
.../Fedora-Server-DVD-i386-23.iso.txt | 29 +++++++
.../Fedora-Server-DVD-x86_64-23.iso.txt | 29 +++++++
.../Fedora-Server-netinst-i386-23.iso.txt | 29 +++++++
.../Fedora-Server-netinst-x86_64-23.iso.txt | 29 +++++++
...a-Workstation-netinst-i386-23_Beta.iso.txt | 29 +++++++
...Workstation-netinst-x86_64-23_Beta.iso.txt | 29 +++++++
.../Fedora-Server-dvd-i386-24-1.2.iso.txt | 29 +++++++
.../Fedora-Server-dvd-x86_64-24-1.2.iso.txt | 29 +++++++
.../Fedora-Server-netinst-i386-24-1.2.iso.txt | 29 +++++++
...edora-Server-netinst-x86_64-24-1.2.iso.txt | 29 +++++++
...edora-Workstation-Live-i386-24-1.2.iso.txt | 29 +++++++
...ora-Workstation-Live-x86_64-24-1.2.iso.txt | 29 +++++++
...ra-Workstation-netinst-i386-24-1.2.iso.txt | 29 +++++++
...-Workstation-netinst-x86_64-24-1.2.iso.txt | 29 +++++++
.../Fedora-Server-dvd-i386-25-1.3.iso.txt | 29 +++++++
.../Fedora-Server-dvd-x86_64-25-1.3.iso.txt | 29 +++++++
.../Fedora-Server-netinst-i386-25-1.3.iso.txt | 29 +++++++
...edora-Server-netinst-x86_64-25-1.3.iso.txt | 29 +++++++
...edora-Workstation-Live-i386-25-1.3.iso.txt | 29 +++++++
...ora-Workstation-Live-x86_64-25-1.3.iso.txt | 29 +++++++
...ra-Workstation-netinst-i386-25-1.3.iso.txt | 29 +++++++
...-Workstation-netinst-x86_64-25-1.3.iso.txt | 29 +++++++
.../Fedora-Server-dvd-x86_64-26-1.5.iso.txt | 29 +++++++
...edora-Server-netinst-x86_64-26-1.5.iso.txt | 29 +++++++
...ora-Workstation-Live-x86_64-26-1.5.iso.txt | 29 +++++++
...-Workstation-netinst-x86_64-26-1.5.iso.txt | 29 +++++++
.../Fedora-Server-dvd-x86_64-27-1.6.iso.txt | 34 ++++++++
...edora-Server-netinst-x86_64-27-1.6.iso.txt | 34 ++++++++
...ora-Workstation-Live-x86_64-27-1.6.iso.txt | 34 ++++++++
...-Workstation-netinst-x86_64-27-1.6.iso.txt | 34 ++++++++
...stationOstree-ostree-x86_64-27-1.6.iso.txt | 29 +++++++
.../Fedora-Server-dvd-x86_64-28-1.1.iso.txt | 29 +++++++
...edora-Server-netinst-x86_64-28-1.1.iso.txt | 29 +++++++
...ora-Workstation-Live-x86_64-28-1.1.iso.txt | 29 +++++++
...a-Everything-netinst-x86_64-29-1.2.iso.txt | 29 +++++++
.../Fedora-Server-dvd-x86_64-29-1.2.iso.txt | 29 +++++++
...edora-Server-netinst-x86_64-29-1.2.iso.txt | 29 +++++++
...-Workstation-netinst-x86_64-29-1.2.iso.txt | 29 +++++++
.../fedora/fedora3/FC3-i386-DVD.iso.txt | 29 +++++++
.../fedora/fedora3/FC3-i386-disc1.iso.txt | 29 +++++++
.../fedora/fedora3/FC3-i386-disc2.iso.txt | 16 ++++
.../fedora/fedora3/FC3-i386-disc3.iso.txt | 16 ++++
.../fedora/fedora3/FC3-i386-disc4.iso.txt | 16 ++++
.../fedora/fedora3/FC3-x86_64-DVD.iso.txt | 29 +++++++
.../fedora/fedora3/FC3-x86_64-disc1.iso.txt | 29 +++++++
.../fedora/fedora3/FC3-x86_64-disc2.iso.txt | 16 ++++
.../fedora/fedora3/FC3-x86_64-disc3.iso.txt | 16 ++++
.../fedora/fedora3/FC3-x86_64-disc4.iso.txt | 16 ++++
.../fedora/fedora4/FC4-i386-DVD.iso.txt | 29 +++++++
.../fedora/fedora4/FC4-i386-disc1.iso.txt | 29 +++++++
.../fedora/fedora4/FC4-i386-disc2.iso.txt | 16 ++++
.../fedora/fedora4/FC4-i386-disc3.iso.txt | 16 ++++
.../fedora/fedora4/FC4-i386-disc4.iso.txt | 16 ++++
.../fedora/fedora4/FC4-ppc-DVD.iso.txt | 16 ++++
.../fedora/fedora4/FC4-ppc-disc1.iso.txt | 16 ++++
.../fedora/fedora4/FC4-ppc-disc2.iso.txt | 16 ++++
.../fedora/fedora4/FC4-ppc-disc3.iso.txt | 16 ++++
.../fedora/fedora4/FC4-ppc-disc4.iso.txt | 16 ++++
.../fedora/fedora4/FC4-ppc-disc5.iso.txt | 16 ++++
.../fedora/fedora4/FC4-x86_64-DVD.iso.txt | 29 +++++++
.../fedora/fedora4/FC4-x86_64-disc1.iso.txt | 29 +++++++
.../fedora/fedora4/FC4-x86_64-disc2.iso.txt | 16 ++++
.../fedora/fedora4/FC4-x86_64-disc3.iso.txt | 16 ++++
.../fedora/fedora4/FC4-x86_64-disc4.iso.txt | 16 ++++
.../fedora/fedora4/FC4-x86_64-disc5.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-i386-DVD.iso.txt | 29 +++++++
.../fedora/fedora5/FC-5-i386-disc1.iso.txt | 29 +++++++
.../fedora/fedora5/FC-5-i386-disc2.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-i386-disc3.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-i386-disc4.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-i386-disc5.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-ppc-DVD.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-ppc-disc1.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-ppc-disc2.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-ppc-disc3.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-ppc-disc4.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-ppc-disc5.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-x86_64-DVD.iso.txt | 29 +++++++
.../fedora/fedora5/FC-5-x86_64-disc1.iso.txt | 29 +++++++
.../fedora/fedora5/FC-5-x86_64-disc2.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-x86_64-disc3.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-x86_64-disc4.iso.txt | 16 ++++
.../fedora/fedora5/FC-5-x86_64-disc5.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-i386-DVD.iso.txt | 29 +++++++
.../fedora/fedora6/FC-6-i386-disc1.iso.txt | 29 +++++++
.../fedora/fedora6/FC-6-i386-disc2.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-i386-disc3.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-i386-disc4.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-i386-disc5.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-ppc-DVD.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-ppc-disc1.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-ppc-disc2.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-ppc-disc3.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-ppc-disc4.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-ppc-disc5.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-ppc-disc6.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-x86_64-DVD.iso.txt | 29 +++++++
.../fedora/fedora6/FC-6-x86_64-disc1.iso.txt | 29 +++++++
.../fedora/fedora6/FC-6-x86_64-disc2.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-x86_64-disc3.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-x86_64-disc4.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-x86_64-disc5.iso.txt | 16 ++++
.../fedora/fedora6/FC-6-x86_64-disc6.iso.txt | 16 ++++
.../fedora/fedora7/F-7-i386-DVD.iso.txt | 29 +++++++
.../fedora/fedora7/F-7-ppc-DVD.iso.txt | 16 ++++
.../fedora/fedora7/F-7-x86_64-DVD.iso.txt | 29 +++++++
.../fedora7/Fedora-7-KDE-Live-i686.iso.txt | 29 +++++++
.../fedora7/Fedora-7-KDE-Live-x86_64.iso.txt | 29 +++++++
.../fedora/fedora7/Fedora-7-Live-i686.iso.txt | 29 +++++++
.../fedora7/Fedora-7-Live-x86_64.iso.txt | 29 +++++++
.../fedora8/Fedora-8-Live-KDE-i686.iso.txt | 29 +++++++
.../fedora8/Fedora-8-Live-KDE-x86_64.iso.txt | 29 +++++++
.../fedora/fedora8/Fedora-8-Live-i686.iso.txt | 29 +++++++
.../fedora/fedora8/Fedora-8-Live-ppc.iso.txt | 16 ++++
.../fedora8/Fedora-8-Live-x86_64.iso.txt | 29 +++++++
.../fedora/fedora8/Fedora-8-i386-DVD.iso.txt | 29 +++++++
.../fedora/fedora8/Fedora-8-ppc-DVD.iso.txt | 16 ++++
.../fedora8/Fedora-8-x86_64-DVD.iso.txt | 29 +++++++
.../fedora/fedora9/Fedora-9-i386-DVD.iso.txt | 29 +++++++
.../fedora9/Fedora-9-i386-disc1.iso.txt | 29 +++++++
.../fedora9/Fedora-9-i386-disc2.iso.txt | 16 ++++
.../fedora9/Fedora-9-i386-disc3.iso.txt | 16 ++++
.../fedora9/Fedora-9-i386-disc4.iso.txt | 16 ++++
.../fedora9/Fedora-9-i386-disc5.iso.txt | 16 ++++
.../fedora9/Fedora-9-i386-disc6.iso.txt | 16 ++++
.../fedora9/Fedora-9-i686-Live-KDE.iso.txt | 29 +++++++
.../fedora/fedora9/Fedora-9-i686-Live.iso.txt | 29 +++++++
.../fedora/fedora9/Fedora-9-ppc-DVD.iso.txt | 16 ++++
.../fedora/fedora9/Fedora-9-ppc-disc1.iso.txt | 16 ++++
.../fedora/fedora9/Fedora-9-ppc-disc2.iso.txt | 16 ++++
.../fedora/fedora9/Fedora-9-ppc-disc3.iso.txt | 16 ++++
.../fedora/fedora9/Fedora-9-ppc-disc4.iso.txt | 16 ++++
.../fedora/fedora9/Fedora-9-ppc-disc5.iso.txt | 16 ++++
.../fedora/fedora9/Fedora-9-ppc-disc6.iso.txt | 16 ++++
.../fedora/fedora9/Fedora-9-ppc-disc7.iso.txt | 16 ++++
.../fedora9/Fedora-9-x86_64-DVD.iso.txt | 29 +++++++
.../fedora9/Fedora-9-x86_64-Live-KDE.iso.txt | 29 +++++++
.../fedora9/Fedora-9-x86_64-Live.iso.txt | 29 +++++++
.../fedora9/Fedora-9-x86_64-disc1.iso.txt | 29 +++++++
.../fedora9/Fedora-9-x86_64-disc2.iso.txt | 16 ++++
.../fedora9/Fedora-9-x86_64-disc3.iso.txt | 16 ++++
.../fedora9/Fedora-9-x86_64-disc4.iso.txt | 16 ++++
.../fedora9/Fedora-9-x86_64-disc5.iso.txt | 16 ++++
.../fedora9/Fedora-9-x86_64-disc6.iso.txt | 16 ++++
.../fedora9/Fedora-9-x86_64-disc7.iso.txt | 16 ++++
...icWorkstation-ostree-x86_64-28-1.1.iso.txt | 29 +++++++
...ra-Silverblue-ostree-x86_64-29-1.2.iso.txt | 29 +++++++
.../FreeBSD-10.1-RELEASE-amd64-dvd1.iso.txt | 29 +++++++
.../FreeBSD-10.2-RELEASE-amd64-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-10.3-RELEASE-amd64-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-10.4-RELEASE-amd64-disc1.iso.txt | 33 ++++++++
.../FreeBSD-10.4-RELEASE-amd64-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-10.4-RELEASE-i386-disc1.iso.txt | 33 ++++++++
.../FreeBSD-10.4-RELEASE-i386-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-11.0-RELEASE-amd64-disc1.iso.txt | 33 ++++++++
.../FreeBSD-11.0-RELEASE-amd64-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-11.0-RELEASE-i386-disc1.iso.txt | 33 ++++++++
.../FreeBSD-11.0-RELEASE-i386-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-11.1-RELEASE-amd64-disc1.iso.txt | 33 ++++++++
.../FreeBSD-11.1-RELEASE-amd64-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-11.1-RELEASE-i386-disc1.iso.txt | 33 ++++++++
.../FreeBSD-11.1-RELEASE-i386-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-11.2-RELEASE-amd64-disc1.iso.txt | 33 ++++++++
.../FreeBSD-11.2-RELEASE-amd64-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-11.2-RELEASE-i386-disc1.iso.txt | 33 ++++++++
.../FreeBSD-11.2-RELEASE-i386-dvd1.iso.txt | 33 ++++++++
.../FreeBSD-12.0-RELEASE-amd64-disc1.iso.txt | 29 +++++++
.../FreeBSD-12.0-RELEASE-amd64-dvd1.iso.txt | 29 +++++++
.../FreeBSD-12.0-RELEASE-i386-disc1.iso.txt | 29 +++++++
.../FreeBSD-12.0-RELEASE-i386-dvd1.iso.txt | 29 +++++++
.../isodata/freedos/freedos1.2/FD12CD.iso.txt | 29 +++++++
.../freedos/freedos1.2/FD12LGCY.iso.txt | 29 +++++++
...all-amd64-minimal-20190212T214502Z.iso.txt | 29 +++++++
...stall-x86-minimal-20190214T185527Z.iso.txt | 29 +++++++
.../gnome/gnome3.8/GNOME-3.7.92.iso.txt | 29 +++++++
.../haiku-nightly-anyboot-x86.iso.txt | 29 +++++++
.../haiku-nightly-anyboot-x86_64.iso.txt | 29 +++++++
.../haikur1alpha1/haiku-r1alpha1.iso.txt | 29 +++++++
.../haiku-r1alpha2-sources.iso.txt | 29 +++++++
.../haikur1alpha3/haiku-r1alpha3.iso.txt | 29 +++++++
.../haikur1alpha4.1/haiku-r1alpha4.iso.txt | 29 +++++++
.../haiku-release-anyboot-x86.iso.txt | 29 +++++++
.../haiku-release-anyboot-x86_64.iso.txt | 29 +++++++
.../mageia/mageia1/mageia-dual-1.iso.txt | 29 +++++++
.../mageia/mageia1/mageia-dvd-1-i586.iso.txt | 29 +++++++
...-GNOME-europe1-americas-cdrom-i586.iso.txt | 29 +++++++
...1-KDE4-europe1-americas-cdrom-i586.iso.txt | 29 +++++++
.../mageia/mageia2/Mageia-2-dual-CD.iso.txt | 29 +++++++
.../mageia/mageia2/Mageia-2-i586-DVD.iso.txt | 29 +++++++
.../Mageia-3-LiveCD-GNOME-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-3-LiveCD-KDE4-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-3-LiveDVD-GNOME-i586-DVD.iso.txt | 29 +++++++
.../Mageia-3-LiveDVD-GNOME-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-3-LiveDVD-KDE4-i586-DVD.iso.txt | 29 +++++++
.../Mageia-3-LiveDVD-KDE4-x86_64-DVD.iso.txt | 29 +++++++
.../mageia/mageia3/Mageia-3-dual-CD.iso.txt | 29 +++++++
.../mageia/mageia3/Mageia-3-i586-DVD.iso.txt | 29 +++++++
.../mageia3/Mageia-3-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-4-LiveCD-GNOME-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-4-LiveCD-KDE4-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-4-LiveDVD-GNOME-i586-DVD.iso.txt | 29 +++++++
.../Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-4-LiveDVD-KDE4-i586-DVD.iso.txt | 29 +++++++
.../Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso.txt | 29 +++++++
.../mageia/mageia4/Mageia-4-dual-DVD.iso.txt | 29 +++++++
.../mageia/mageia4/Mageia-4-i586-DVD.iso.txt | 29 +++++++
.../mageia4/Mageia-4-x86_64-DVD.iso.txt | 29 +++++++
...Mageia-4.1-LiveCD-GNOME-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-4.1-LiveCD-KDE4-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-4.1-LiveDVD-GNOME-i586-DVD.iso.txt | 29 +++++++
...ageia-4.1-LiveDVD-GNOME-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-4.1-LiveDVD-KDE4-i586-DVD.iso.txt | 29 +++++++
...Mageia-4.1-LiveDVD-KDE4-x86_64-DVD.iso.txt | 29 +++++++
.../mageia4/Mageia-4.1-dual-DVD.iso.txt | 29 +++++++
.../mageia4/Mageia-4.1-i586-DVD.iso.txt | 29 +++++++
.../mageia4/Mageia-4.1-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-5-LiveCD-GNOME-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-5-LiveCD-KDE4-en-i586-CD.iso.txt | 29 +++++++
.../Mageia-5-LiveDVD-GNOME-i586-DVD.iso.txt | 29 +++++++
.../Mageia-5-LiveDVD-GNOME-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-5-LiveDVD-KDE4-i586-DVD.iso.txt | 29 +++++++
.../Mageia-5-LiveDVD-KDE4-x86_64-DVD.iso.txt | 29 +++++++
.../mageia/mageia5/Mageia-5-dual-DVD.iso.txt | 29 +++++++
.../mageia/mageia5/Mageia-5-i586-DVD.iso.txt | 29 +++++++
.../mageia5/Mageia-5-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-6-LiveDVD-GNOME-x86_64-DVD.iso.txt | 29 +++++++
...Mageia-6-LiveDVD-Plasma-x86_64-DVD.iso.txt | 29 +++++++
.../Mageia-6-LiveDVD-Xfce-i586-DVD.iso.txt | 29 +++++++
.../Mageia-6-LiveDVD-Xfce-x86_64-DVD.iso.txt | 29 +++++++
.../mageia/mageia6/Mageia-6-i586-DVD.iso.txt | 29 +++++++
.../mageia6/Mageia-6-x86_64-DVD.iso.txt | 29 +++++++
.../NetBSD-6.0-amd64-boot-com.iso.txt | 16 ++++
.../netbsd6.0/NetBSD-6.0-amd64-boot.iso.txt | 16 ++++
.../netbsd/netbsd6.0/NetBSD-6.0-amd64.iso.txt | 16 ++++
.../NetBSD-6.0-i386-boot-com.iso.txt | 16 ++++
.../netbsd6.0/NetBSD-6.0-i386-boot.iso.txt | 16 ++++
.../netbsd/netbsd6.0/NetBSD-6.0-i386.iso.txt | 16 ++++
.../NetBSD-6.1-amd64-boot-com.iso.txt | 16 ++++
.../netbsd6.1/NetBSD-6.1-amd64-boot.iso.txt | 16 ++++
.../netbsd/netbsd6.1/NetBSD-6.1-amd64.iso.txt | 16 ++++
.../NetBSD-6.1-i386-boot-com.iso.txt | 16 ++++
.../netbsd6.1/NetBSD-6.1-i386-boot.iso.txt | 16 ++++
.../netbsd/netbsd6.1/NetBSD-6.1-i386.iso.txt | 16 ++++
.../NetBSD-7.0-amd64-boot-com.iso.txt | 16 ++++
.../netbsd7.0/NetBSD-7.0-amd64-boot.iso.txt | 16 ++++
.../netbsd/netbsd7.0/NetBSD-7.0-amd64.iso.txt | 16 ++++
.../NetBSD-7.0-i386-boot-com.iso.txt | 16 ++++
.../netbsd7.0/NetBSD-7.0-i386-boot.iso.txt | 16 ++++
.../netbsd/netbsd7.0/NetBSD-7.0-i386.iso.txt | 16 ++++
.../NetBSD-7.1.1-amd64-boot-com.iso.txt | 16 ++++
.../NetBSD-7.1.1-amd64-boot.iso.txt | 16 ++++
.../netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt | 29 +++++++
.../NetBSD-7.1.1-i386-boot-com.iso.txt | 16 ++++
.../NetBSD-7.1.1-i386-boot.iso.txt | 16 ++++
.../netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt | 16 ++++
.../NetBSD-7.1.2-amd64-boot-com.iso.txt | 29 +++++++
.../NetBSD-7.1.2-amd64-boot.iso.txt | 33 ++++++++
.../netbsd7.1.2/NetBSD-7.1.2-amd64.iso.txt | 29 +++++++
.../NetBSD-7.1.2-i386-boot-com.iso.txt | 33 ++++++++
.../NetBSD-7.1.2-i386-boot.iso.txt | 33 ++++++++
.../netbsd7.1.2/NetBSD-7.1.2-i386.iso.txt | 33 ++++++++
.../NetBSD-7.1-amd64-boot-com.iso.txt | 16 ++++
.../netbsd7.1/NetBSD-7.1-amd64-boot.iso.txt | 16 ++++
.../netbsd/netbsd7.1/NetBSD-7.1-amd64.iso.txt | 16 ++++
.../NetBSD-7.1-i386-boot-com.iso.txt | 16 ++++
.../netbsd7.1/NetBSD-7.1-i386-boot.iso.txt | 29 +++++++
.../netbsd/netbsd7.1/NetBSD-7.1-i386.iso.txt | 16 ++++
.../NetBSD-7.2-amd64-boot-com.iso.txt | 33 ++++++++
.../netbsd7.2/NetBSD-7.2-amd64-boot.iso.txt | 33 ++++++++
.../netbsd/netbsd7.2/NetBSD-7.2-amd64.iso.txt | 33 ++++++++
.../NetBSD-7.2-i386-boot-com.iso.txt | 33 ++++++++
.../netbsd7.2/NetBSD-7.2-i386-boot.iso.txt | 33 ++++++++
.../netbsd/netbsd7.2/NetBSD-7.2-i386.iso.txt | 33 ++++++++
.../NetBSD-8.0-amd64-boot-com.iso.txt | 34 ++++++++
.../netbsd8.0/NetBSD-8.0-amd64-boot.iso.txt | 34 ++++++++
.../netbsd/netbsd8.0/NetBSD-8.0-amd64.iso.txt | 34 ++++++++
.../NetBSD-8.0-i386-boot-com.iso.txt | 34 ++++++++
.../netbsd8.0/NetBSD-8.0-i386-boot.iso.txt | 34 ++++++++
.../netbsd/netbsd8.0/NetBSD-8.0-i386.iso.txt | 34 ++++++++
.../openbsd/openbsd4.2/openbsd-4.2-amd64.txt | 29 +++++++
.../openbsd/openbsd4.2/openbsd-4.2-i386.txt | 29 +++++++
.../openbsd/openbsd4.3/openbsd-4.3-amd64.txt | 29 +++++++
.../openbsd/openbsd4.3/openbsd-4.3-i386.txt | 29 +++++++
.../openbsd/openbsd4.4/openbsd-4.4-amd64.txt | 29 +++++++
.../openbsd/openbsd4.4/openbsd-4.4-i386.txt | 29 +++++++
.../openbsd/openbsd4.5/openbsd-4.5-amd64.txt | 29 +++++++
.../openbsd/openbsd4.5/openbsd-4.5-i386.txt | 29 +++++++
.../openbsd/openbsd4.8/openbsd-4.8-amd64.txt | 29 +++++++
.../openbsd/openbsd4.8/openbsd-4.8-i386.txt | 29 +++++++
.../openbsd/openbsd4.9/openbsd-4.9-amd64.txt | 29 +++++++
.../openbsd/openbsd4.9/openbsd-4.9-i386.txt | 29 +++++++
.../openbsd/openbsd5.0/openbsd-5.0-amd64.txt | 29 +++++++
.../openbsd/openbsd5.0/openbsd-5.0-i386.txt | 29 +++++++
.../openbsd/openbsd5.1/openbsd-5.1-amd64.txt | 29 +++++++
.../openbsd/openbsd5.1/openbsd-5.1-i386.txt | 29 +++++++
.../openbsd/openbsd5.2/openbsd-5.2-amd64.txt | 29 +++++++
.../openbsd/openbsd5.2/openbsd-5.2-i386.txt | 29 +++++++
.../openbsd/openbsd5.3/openbsd-5.3-amd64.txt | 29 +++++++
.../openbsd/openbsd5.3/openbsd-5.3-i386.txt | 29 +++++++
.../openbsd/openbsd5.4/openbsd-5.4-amd64.txt | 33 ++++++++
.../openbsd/openbsd5.4/openbsd-5.4-i386.txt | 33 ++++++++
.../openbsd/openbsd5.5/openbsd-5.5-amd64.txt | 33 ++++++++
.../openbsd/openbsd5.5/openbsd-5.5-i386.txt | 33 ++++++++
.../openbsd/openbsd5.6/openbsd-5.6-amd64.txt | 33 ++++++++
.../openbsd/openbsd5.6/openbsd-5.6-i386.txt | 33 ++++++++
.../openbsd/openbsd5.7/openbsd-5.7-amd64.txt | 33 ++++++++
.../openbsd/openbsd5.7/openbsd-5.7-i386.txt | 33 ++++++++
.../openbsd/openbsd5.8/openbsd-5.8-amd64.txt | 33 ++++++++
.../openbsd/openbsd5.8/openbsd-5.8-i386.txt | 33 ++++++++
.../openbsd/openbsd5.9/openbsd-5.9-amd64.txt | 33 ++++++++
.../openbsd/openbsd5.9/openbsd-5.9-i386.txt | 33 ++++++++
.../openbsd/openbsd6.0/openbsd-6.0-amd64.txt | 33 ++++++++
.../openbsd/openbsd6.0/openbsd-6.0-i386.txt | 33 ++++++++
.../openbsd/openbsd6.1/openbsd-6.1-amd64.txt | 33 ++++++++
.../openbsd/openbsd6.1/openbsd-6.1-i386.txt | 33 ++++++++
.../openbsd/openbsd6.2/openbsd-6.2-amd64.txt | 33 ++++++++
.../openbsd/openbsd6.2/openbsd-6.2-i386.txt | 33 ++++++++
.../openbsd/openbsd6.3/openbsd-6.3-amd64.txt | 33 ++++++++
.../openbsd/openbsd6.3/openbsd-6.3-i386.txt | 33 ++++++++
.../openSUSE-12.2-DVD-i586.iso.txt | 29 +++++++
.../openSUSE-12.2-DVD-x86_64.iso.txt | 29 +++++++
.../openSUSE-12.3-DVD-i586.iso.txt | 29 +++++++
.../openSUSE-12.3-DVD-x86_64.iso.txt | 29 +++++++
.../openSUSE-13.1-GNOME-Live-i686.iso.txt | 29 +++++++
.../openSUSE-13.1-GNOME-Live-x86_64.iso.txt | 29 +++++++
.../openSUSE-13.1-KDE-Live-i686.iso.txt | 29 +++++++
.../openSUSE-13.1-KDE-Live-x86_64.iso.txt | 29 +++++++
.../openSUSE-13.2-DVD-i586.iso.txt | 29 +++++++
.../openSUSE-13.2-DVD-x86_64.iso.txt | 29 +++++++
.../openSUSE-Leap-15.0-DVD-x86_64.iso.txt | 29 +++++++
.../openSUSE-Leap-15.0-NET-x86_64.iso.txt | 29 +++++++
.../openSUSE-42.1-DVD-x86_64.iso.txt | 29 +++++++
.../openSUSE-Leap-42.2-DVD-x86_64.iso.txt | 29 +++++++
.../openSUSE-Leap-42.3-DVD-x86_64.iso.txt | 29 +++++++
.../openSUSE-Leap-42.3-NET-x86_64.iso.txt | 29 +++++++
...enSUSE-Tumbleweed-DVD-i586-Current.iso.txt | 29 +++++++
...SUSE-Tumbleweed-DVD-x86_64-Current.iso.txt | 29 +++++++
...-DVD-x86_64-Snapshot20180420-Media.iso.txt | 29 +++++++
...ed-NET-i586-Snapshot20180420-Media.iso.txt | 29 +++++++
...weed-NET-x86_64-Snapshot20180420-Media.iso | 29 +++++++
.../popos17.10/pop-os_amd64_intel_57.iso.txt | 29 +++++++
.../popos17.10/pop-os_amd64_nvidia_46.iso.txt | 29 +++++++
.../pop-os_18.04_amd64_intel_32.iso.txt | 29 +++++++
.../pop-os_18.04_amd64_nvidia_32.iso.txt | 29 +++++++
.../pop-os_18.10_amd64_intel_3.iso.txt | 29 +++++++
.../pop-os_18.10_amd64_nvidia_3.iso.txt | 29 +++++++
...0-gnome-live_20180904-amd64.hybrid.iso.txt | 29 +++++++
...0-gnome-live_20181210-amd64.hybrid.iso.txt | 29 +++++++
...0-gnome-live_20190128-amd64.hybrid.iso.txt | 29 +++++++
...0-gnome-live_20190210-amd64.hybrid.iso.txt | 29 +++++++
...L-Atomic-Host-Installer-7.0.0-Beta.iso.txt | 29 +++++++
...rhel-atomic-installer-7.1-0.x86_64.iso.txt | 29 +++++++
...rhel-atomic-installer-7.1-1.x86_64.iso.txt | 29 +++++++
...hel-atomic-installer-7.2-10.x86_64.iso.txt | 29 +++++++
...hel-atomic-installer-7.2-11.x86_64.iso.txt | 29 +++++++
...hel-atomic-installer-7.2-12.x86_64.iso.txt | 29 +++++++
...hel-atomic-installer-7.2-13.x86_64.iso.txt | 29 +++++++
...el-atomic-installer-7.3.0-3.x86_64.iso.txt | 29 +++++++
...el-atomic-installer-7.3.1-1.x86_64.iso.txt | 29 +++++++
...el-atomic-installer-7.3.2-1.x86_64.iso.txt | 29 +++++++
...el-atomic-installer-7.3.3-1.x86_64.iso.txt | 29 +++++++
...el-atomic-installer-7.4.0-1.x86_64.iso.txt | 29 +++++++
.../rhel-server-5.10-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-5.10-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-server-5.11-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-server-5.5-x86_64-dvd.iso.txt | 29 +++++++
.../rhel5.6/rhel-client-5.6-i386-dvd.iso.txt | 29 +++++++
.../rhel-client-5.6-x86_64-dvd1.iso.txt | 29 +++++++
.../rhel-client-5.6-x86_64-dvd2.iso.txt | 16 ++++
.../rhel5.6/rhel-server-5.6-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-5.6-x86_64-dvd.iso.txt | 29 +++++++
.../rhel5.7/rhel-client-5.7-i386-dvd.iso.txt | 29 +++++++
.../rhel-client-5.7-x86_64-dvd1.iso.txt | 29 +++++++
.../rhel-client-5.7-x86_64-dvd2.iso.txt | 16 ++++
.../rhel5.7/rhel-server-5.7-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-5.7-x86_64-dvd.iso.txt | 29 +++++++
.../rhel/rhel5.8/rhel-5.8-i386.iso.txt | 29 +++++++
.../rhel/rhel5.8/rhel-5.8-x86_64.iso.txt | 29 +++++++
.../rhel5.9/rhel-server-5.9-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-5.9-x86_64-dvd.iso.txt | 29 +++++++
.../rhel6.0/rhel-server-6.0-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-6.0-x86_64-boot.iso.txt | 29 +++++++
.../rhel-server-6.0-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.0-i386-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.0-x86_64-dvd.iso.txt | 29 +++++++
.../rhel6.1/rhel-client-6.1-i386-dvd.iso.txt | 29 +++++++
.../rhel-client-6.1-x86_64-dvd.iso.txt | 29 +++++++
.../rhel6.1/rhel-server-6.1-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-6.1-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.1-i386-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.1-x86_64-dvd.iso.txt | 29 +++++++
...L-6.10-20180525.0-Server-i386-dvd1.iso.txt | 29 +++++++
...-6.10-20180525.0-Server-ppc64-dvd1.iso.txt | 16 ++++
...-6.10-20180525.0-Server-s390x-dvd1.iso.txt | 16 ++++
...6.10-20180525.0-Server-x86_64-dvd1.iso.txt | 29 +++++++
.../rhel6.2/rhel-client-6.2-i386-dvd.iso.txt | 29 +++++++
.../rhel-client-6.2-x86_64-dvd.iso.txt | 29 +++++++
.../rhel6.2/rhel-server-6.2-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-6.2-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.2-i386-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.2-x86_64-dvd.iso.txt | 29 +++++++
.../rhel6.3/rhel-server-6.3-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-6.3-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.3-i386-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.3-x86_64-dvd.iso.txt | 29 +++++++
.../rhel6.4/rhel-server-6.4-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-6.4-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.4-i386-dvd.iso.txt | 29 +++++++
.../rhel-workstation-6.4-x86_64-dvd.iso.txt | 29 +++++++
...20131213.0-Workstation-x86_64-DVD1.iso.txt | 29 +++++++
.../rhel-server-6.6-x86_64-dvd.iso.txt | 29 +++++++
.../rhel6.7/rhel-server-6.7-i386-dvd.iso.txt | 29 +++++++
.../rhel-server-6.7-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-server-6.8-x86_64-dvd.iso.txt | 29 +++++++
...EL-6.9-20170309.0-Server-i386-dvd1.iso.txt | 29 +++++++
...-6.9-20170309.0-Server-x86_64-dvd1.iso.txt | 29 +++++++
...-7.0-20140507.0-Client-x86_64-dvd1.iso.txt | 29 +++++++
...20140507.0-ComputeNode-x86_64-dvd1.iso.txt | 29 +++++++
...-7.0-20140507.0-Server-x86_64-dvd1.iso.txt | 29 +++++++
...20140507.0-Workstation-x86_64-dvd1.iso.txt | 29 +++++++
...1.5-20141017.1-Server-aarch64-dvd1.iso.txt | 29 +++++++
...-7.1-20150219.1-Client-x86_64-dvd1.iso.txt | 29 +++++++
...-7.1-20150219.1-Server-x86_64-dvd1.iso.txt | 29 +++++++
...20150219.1-Workstation-x86_64-dvd1.iso.txt | 29 +++++++
...7.1-20150616.0-Server-aarch64-dvd1.iso.txt | 29 +++++++
.../rhel-computenode-7.2-x86_64-dvd.iso.txt | 29 +++++++
.../rhel-server-7.2-aarch64-dvd.iso.txt | 29 +++++++
.../rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt | 16 ++++
.../rhel-server-7.2-ppc64le-dvd.iso.txt | 16 ++++
.../rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt | 16 ++++
.../rhel-server-7.2-x86_64-dvd.iso.txt | 29 +++++++
...7.3-20161019.0-Server-aarch64-dvd1.iso.txt | 29 +++++++
...L-7.3-20161019.0-Server-ppc64-dvd1.iso.txt | 16 ++++
...7.3-20161019.0-Server-ppc64le-dvd1.iso.txt | 16 ++++
...L-7.3-20161019.0-Server-s390x-dvd1.iso.txt | 16 ++++
...-7.3-20161019.0-Server-x86_64-dvd1.iso.txt | 29 +++++++
...7.4-20170711.0-Server-aarch64-dvd1.iso.txt | 29 +++++++
...L-7.4-20170711.0-Server-ppc64-dvd1.iso.txt | 16 ++++
...7.4-20170711.0-Server-ppc64le-dvd1.iso.txt | 16 ++++
...L-7.4-20170711.0-Server-s390x-dvd1.iso.txt | 16 ++++
...-7.4-20170711.0-Server-x86_64-dvd1.iso.txt | 29 +++++++
...L-7.5-20180322.0-Server-ppc64-dvd1.iso.txt | 16 ++++
...7.5-20180322.0-Server-ppc64le-dvd1.iso.txt | 16 ++++
...L-7.5-20180322.0-Server-s390x-dvd1.iso.txt | 29 +++++++
...-7.5-20180322.0-Server-x86_64-dvd1.iso.txt | 29 +++++++
...L-7.6-20181010.0-Server-ppc64-boot.iso.txt | 16 ++++
...L-7.6-20181010.0-Server-ppc64-dvd1.iso.txt | 16 ++++
...7.6-20181010.0-Server-ppc64le-boot.iso.txt | 16 ++++
...7.6-20181010.0-Server-ppc64le-dvd1.iso.txt | 16 ++++
...L-7.6-20181010.0-Server-s390x-boot.iso.txt | 29 +++++++
...L-7.6-20181010.0-Server-s390x-dvd1.iso.txt | 29 +++++++
...-7.6-20181010.0-Server-x86_64-boot.iso.txt | 29 +++++++
...-7.6-20181010.0-Server-x86_64-dvd1.iso.txt | 29 +++++++
...20181010.0-Workstation-x86_64-boot.iso.txt | 29 +++++++
...20181010.0-Workstation-x86_64-dvd1.iso.txt | 29 +++++++
.../RHEL-8.0-20181113.1-aarch64-boot.iso.txt | 29 +++++++
.../RHEL-8.0-20181113.1-aarch64-dvd1.iso.txt | 29 +++++++
.../RHEL-8.0-20181113.1-ppc64le-boot.iso.txt | 16 ++++
.../RHEL-8.0-20181113.1-ppc64le-dvd1.iso.txt | 16 ++++
.../RHEL-8.0-20181113.1-s390x-boot.iso.txt | 29 +++++++
.../RHEL-8.0-20181113.1-s390x-dvd1.iso.txt | 29 +++++++
.../RHEL-8.0-20181113.1-x86_64-boot.iso.txt | 29 +++++++
.../RHEL-8.0-20181113.1-x86_64-dvd1.iso.txt | 29 +++++++
.../SLED-11-SP1-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLED-11-SP1-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLED-11-SP2-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLED-11-SP2-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLED-11-SP3-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLED-11-SP3-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLE-12-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...-12-SP2-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...-12-SP3-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...aS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...aS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...aS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...E-15-Installer-DVD-aarch64-GM-DVD1.iso.txt | 29 +++++++
...E-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt | 16 ++++
...SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt | 29 +++++++
...LE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP1-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP1-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP2-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP2-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP3-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP3-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt | 29 +++++++
.../SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../SLE-12-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...E-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...-12-SP2-Server-DVD-aarch64-GM-DVD1.iso.txt | 29 +++++++
...-12-SP2-Server-DVD-ppc64le-GM-DVD1.iso.txt | 16 ++++
...LE-12-SP2-Server-DVD-s390x-GM-DVD1.iso.txt | 29 +++++++
...E-12-SP2-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
...-12-SP3-Server-DVD-aarch64-GM-DVD1.iso.txt | 29 +++++++
...-12-SP3-Server-DVD-ppc64le-GM-DVD1.iso.txt | 16 ++++
...LE-12-SP3-Server-DVD-s390x-GM-DVD1.iso.txt | 29 +++++++
...E-12-SP3-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++
.../ubuntu-10.04.4-desktop-i386.iso.txt | 30 +++++++
.../ubuntu-11.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-11.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-11.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-11.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-11.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-12.04-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-12.04-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-12.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-12.04-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-12.04-server-amd64.iso.txt | 29 +++++++
.../ubuntu-12.04-server-i386.iso.txt | 29 +++++++
.../ubuntu-12.10-desktop-amd64+mac.iso.txt | 29 +++++++
.../ubuntu-12.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-12.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-12.10-server-amd64+mac.iso.txt | 29 +++++++
.../ubuntu-12.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-12.10-server-i386.iso.txt | 29 +++++++
...untu-13.04-beta2-desktop-amd64+mac.iso.txt | 29 +++++++
.../ubuntu-13.04-beta2-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-13.04-beta2-desktop-i386.iso.txt | 29 +++++++
...buntu-13.04-beta2-server-amd64+mac.iso.txt | 29 +++++++
.../ubuntu-13.04-beta2-server-amd64.iso.txt | 29 +++++++
.../ubuntu-13.04-beta2-server-i386.iso.txt | 29 +++++++
.../ubuntu-13.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-13.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-13.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-13.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-14.04.1-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-14.04.1-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-14.04.1-server-amd64.iso.txt | 29 +++++++
.../ubuntu-14.04.1-server-i386.iso.txt | 29 +++++++
.../ubuntu-14.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-14.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-14.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-14.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-15.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-15.04-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-15.04-server-amd64.iso.txt | 29 +++++++
.../ubuntu-15.04-server-i386.iso.txt | 29 +++++++
.../ubuntu-15.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-15.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-15.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-15.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-16.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-16.04-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-16.04-server-amd64.iso.txt | 29 +++++++
.../ubuntu-16.04-server-i386.iso.txt | 29 +++++++
.../ubuntu-16.04-server-powerpc.iso.txt | 17 ++++
.../ubuntu-16.04-server-ppc64el.iso.txt | 17 ++++
.../ubuntu-16.04-server-s390x.iso.txt | 29 +++++++
.../ubuntu-16.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-16.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-16.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-16.10-server-arm64.iso.txt | 29 +++++++
.../ubuntu-16.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-16.10-server-powerpc.iso.txt | 17 ++++
.../ubuntu-16.10-server-ppc64el.iso.txt | 17 ++++
.../ubuntu-16.10-server-s390x.iso.txt | 29 +++++++
.../ubuntu-17.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-17.04-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-17.04-server-amd64.iso.txt | 29 +++++++
.../ubuntu-17.04-server-arm64.iso.txt | 29 +++++++
.../ubuntu-17.04-server-i386.iso.txt | 29 +++++++
.../ubuntu-17.04-server-ppc64el.iso.txt | 17 ++++
.../ubuntu-17.04-server-s390x.iso.txt | 29 +++++++
.../ubuntu-17.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-17.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-17.10-server-arm64.iso.txt | 29 +++++++
.../ubuntu-17.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-17.10-server-ppc64el.iso.txt | 17 ++++
.../ubuntu-17.10-server-s390x.iso.txt | 29 +++++++
.../ubuntu-18.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-18.04-server-amd64.iso.txt | 29 +++++++
.../ubuntu-18.04-server-arm64.iso.txt | 29 +++++++
.../ubuntu-18.04-server-ppc64el.iso.txt | 17 ++++
.../ubuntu-18.04-server-s390x.iso.txt | 29 +++++++
.../ubuntu-18.04.1-desktop-amd64.iso.txt | 29 +++++++
...ubuntu-18.04.1.0-live-server-amd64.iso.txt | 29 +++++++
.../ubuntu18.10/cosmic-desktop-amd64.iso.txt | 29 +++++++
.../cosmic-live-server-amd64.iso.txt | 29 +++++++
.../ubuntu18.10/cosmic-server-amd64.iso.txt | 29 +++++++
.../ubuntu18.10/cosmic-server-arm64.iso.txt | 29 +++++++
.../ubuntu18.10/cosmic-server-ppc64el.iso.txt | 17 ++++
.../ubuntu18.10/cosmic-server-s390x.iso.txt | 29 +++++++
.../ubuntu19.04/disco-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu19.04/disco-server-amd64.iso.txt | 29 +++++++
.../ubuntu19.04/disco-server-arm64.iso.txt | 29 +++++++
.../ubuntu19.04/disco-server-ppc64el.iso.txt | 17 ++++
.../ubuntu19.04/disco-server-s390x.iso.txt | 29 +++++++
.../ubuntu-5.04-install-amd64.iso.txt | 29 +++++++
.../ubuntu-5.04-install-i386.iso.txt | 29 +++++++
.../ubuntu-5.04-install-powerpc.iso.txt | 16 ++++
.../ubuntu5.04/ubuntu-5.04-live-amd64.iso.txt | 29 +++++++
.../ubuntu5.04/ubuntu-5.04-live-i386.iso.txt | 29 +++++++
.../ubuntu-5.04-live-powerpc.iso.txt | 16 ++++
.../ubuntu5.10/ubuntu-5.10-dvd-amd64.iso.txt | 29 +++++++
.../ubuntu5.10/ubuntu-5.10-dvd-i386.iso.txt | 29 +++++++
.../ubuntu-5.10-dvd-powerpc.iso.txt | 16 ++++
.../ubuntu-5.10-install-amd64.iso.txt | 29 +++++++
.../ubuntu-5.10-install-i386.iso.txt | 29 +++++++
.../ubuntu-5.10-install-powerpc.iso.txt | 16 ++++
.../ubuntu5.10/ubuntu-5.10-live-amd64.iso.txt | 29 +++++++
.../ubuntu5.10/ubuntu-5.10-live-i386.iso.txt | 29 +++++++
.../ubuntu-5.10-live-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-6.06-alternate-hppa.iso.txt | 16 ++++
.../ubuntu-6.06-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-6.06-alternate-ia64.iso.txt | 29 +++++++
.../ubuntu-6.06-alternate-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-6.06-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-6.06-desktop-powerpc.iso.txt | 16 ++++
.../ubuntu6.06/ubuntu-6.06-dvd-amd64.iso.txt | 29 +++++++
.../ubuntu6.06/ubuntu-6.06-dvd-i386.iso.txt | 29 +++++++
.../ubuntu-6.06-dvd-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06-server-amd64.iso.txt | 29 +++++++
.../ubuntu-6.06-server-hppa.iso.txt | 16 ++++
.../ubuntu-6.06-server-i386.iso.txt | 29 +++++++
.../ubuntu-6.06-server-ia64.iso.txt | 29 +++++++
.../ubuntu-6.06-server-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06-server-sparc.iso.txt | 16 ++++
.../ubuntu-6.06.1-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-6.06.1-alternate-hppa.iso.txt | 16 ++++
.../ubuntu-6.06.1-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-6.06.1-alternate-ia64.iso.txt | 29 +++++++
.../ubuntu-6.06.1-alternate-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06.1-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-6.06.1-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-6.06.1-desktop-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06.1-dvd-amd64.iso.txt | 29 +++++++
.../ubuntu6.06/ubuntu-6.06.1-dvd-i386.iso.txt | 29 +++++++
.../ubuntu-6.06.1-dvd-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06.1-server-amd64.iso.txt | 29 +++++++
.../ubuntu-6.06.1-server-hppa.iso.txt | 16 ++++
.../ubuntu-6.06.1-server-i386.iso.txt | 29 +++++++
.../ubuntu-6.06.1-server-ia64.iso.txt | 29 +++++++
.../ubuntu-6.06.1-server-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06.1-server-sparc.iso.txt | 16 ++++
.../ubuntu-6.06.2-server-amd64.iso.txt | 29 +++++++
.../ubuntu-6.06.2-server-i386.iso.txt | 29 +++++++
.../ubuntu-6.06.2-server-powerpc.iso.txt | 16 ++++
.../ubuntu-6.06.2-server-sparc.iso.txt | 16 ++++
.../ubuntu-6.10-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-6.10-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-6.10-alternate-powerpc.iso.txt | 16 ++++
.../ubuntu-6.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-6.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-6.10-desktop-powerpc.iso.txt | 16 ++++
.../ubuntu-6.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-6.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-6.10-server-powerpc.iso.txt | 16 ++++
.../ubuntu-6.10-server-sparc.iso.txt | 16 ++++
.../ubuntu-7.04-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-7.04-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-7.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-7.04-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-7.04-server-amd64.iso.txt | 29 +++++++
.../ubuntu-7.04-server-i386.iso.txt | 29 +++++++
.../ubuntu-7.04-server-sparc.iso.txt | 16 ++++
.../ubuntu-7.10-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-7.10-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-7.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-7.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-7.10-server-amd64.iso.txt | 29 +++++++
.../ubuntu-7.10-server-i386.iso.txt | 29 +++++++
.../ubuntu-7.10-server-sparc.iso.txt | 16 ++++
.../ubuntu-8.04-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-8.04-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04-desktop-i386.iso.txt | 29 +++++++
.../ubuntu8.04/ubuntu-8.04-dvd-amd64.iso.txt | 29 +++++++
.../ubuntu8.04/ubuntu-8.04-dvd-i386.iso.txt | 29 +++++++
.../ubuntu-8.04-server-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04-server-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.1-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.1-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.1-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.1-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.1-server-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.1-server-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.2-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.2-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.2-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.2-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.2-server-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.2-server-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.3-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.3-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.3-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.3-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.3-server-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.3-server-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.4-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.4-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.4-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.4-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-8.04.4-server-amd64.iso.txt | 29 +++++++
.../ubuntu-8.04.4-server-i386.iso.txt | 29 +++++++
.../ubuntu-8.10-alternate-amd64.iso.txt | 29 +++++++
.../ubuntu-8.10-alternate-i386.iso.txt | 29 +++++++
.../ubuntu-8.10-desktop-amd64.iso.txt | 29 +++++++
.../ubuntu-8.10-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-8.10-server-amd64.iso.txt | 16 ++++
.../ubuntu-9.04-desktop-i386.iso.txt | 29 +++++++
.../ubuntu-9.04-server-i386.iso.txt | 29 +++++++
.../voidlinux/void-live-i686-20181111.iso.txt | 29 +++++++
.../void-live-x86_64-20181111.iso.txt | 29 +++++++
...IENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt | 29 +++++++
...IENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt | 29 +++++++
...1_updated_apr_2016_x64_dvd_8705540.iso.txt | 29 +++++++
...7_updated_jul_2016_x86_dvd_9055560.iso.txt | 29 +++++++
...ows_10_education_n_x64_dvd_6847236.iso.txt | 29 +++++++
...ndows_10_education_x86_dvd_6848121.iso.txt | 29 +++++++
...rprise_2015_ltsb_n_x64_dvd_6848316.iso.txt | 29 +++++++
...terprise_2015_ltsb_x64_dvd_6848446.iso.txt | 29 +++++++
...ws_10_enterprise_n_x64_dvd_6852541.iso.txt | 29 +++++++
...dows_10_enterprise_x64_dvd_6851151.iso.txt | 29 +++++++
...dows_10_enterprise_x86_dvd_6851156.iso.txt | 30 +++++++
...pdated_sept_2017_x64_dvd_100090817.iso.txt | 29 +++++++
..._multiple_editions_x64_dvd_6846432.iso.txt | 29 +++++++
...7_updated_jul_2016_x64_dvd_9053861.iso.txt | 29 +++++++
..._multiple_editions_x64_dvd_6846434.iso.txt | 29 +++++++
...7_updated_jul_2016_x86_dvd_9057460.iso.txt | 29 +++++++
.../windows/win2k/Win2000S-disk.iso.txt | 29 +++++++
...debug_checked_build_x64_dvd_917521.iso.txt | 29 +++++++
...hyper-v_server_2012_x64_dvd_915600.iso.txt | 29 +++++++
...er_2012_essentials_x64_dvd_1022281.iso.txt | 29 +++++++
...debug_checked_build_x64_dvd_917505.iso.txt | 29 +++++++
...rver_and_foundation_x64_dvd_915793.iso.txt | 29 +++++++
...dows_server_2012_vl_x64_dvd_917758.iso.txt | 29 +++++++
...windows_server_2012_x64_dvd_915478.iso.txt | 29 +++++++
...2_r2_debug_checked_x64_dvd_2708216.iso.txt | 29 +++++++
...r-v_server_2012_r2_x64_dvd_2708236.iso.txt | 29 +++++++
...2_r2_debug_checked_x64_dvd_2707937.iso.txt | 29 +++++++
...ials_debug_checked_x64_dvd_2707170.iso.txt | 29 +++++++
...ntials_with_update_x64_dvd_6052824.iso.txt | 29 +++++++
...2012_r2_essentials_x64_dvd_2707177.iso.txt | 29 +++++++
..._r2_vl_with_update_x64_dvd_6052766.iso.txt | 29 +++++++
..._server_2012_r2_vl_x64_dvd_3319595.iso.txt | 29 +++++++
...012_r2_with_update_x64_dvd_4065220.iso.txt | 29 +++++++
...012_r2_with_update_x64_dvd_6052708.iso.txt | 29 +++++++
...ows_server_2012_r2_x64_dvd_2707946.iso.txt | 29 +++++++
...2012_r2_foundation_x64_dvd_2708426.iso.txt | 29 +++++++
...dation_with_update_x64_dvd_6052810.iso.txt | 29 +++++++
...H_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt | 29 +++++++
...indows_server_2016_x64_dvd_9718492.iso.txt | 29 +++++++
...windows_server_2003_enterprise_x64.iso.txt | 31 +++++++
...en_windows_server_2003_sp2_ia64_cd.iso.txt | 17 ++++
.../en_windows_server_2003_sp2_x64_cd.iso.txt | 17 ++++
.../en_windows_server_2003_sp2_x86_cd.iso.txt | 17 ++++
.../en_windows_server_2003_standard.iso.txt | 29 +++++++
...n_windows_server_2003_standard_x64.iso.txt | 29 +++++++
...ws_server_2003_with_sp1_enterprise.iso.txt | 31 +++++++
...dows_server_2003_with_sp1_standard.iso.txt | 31 +++++++
.../en_win_srv_2003_r2_enterprise_cd1.iso.txt | 31 +++++++
.../en_win_srv_2003_r2_enterprise_cd2.iso.txt | 17 ++++
..._enterprise_with_sp2_cd1_X13-05460.iso.txt | 29 +++++++
..._enterprise_with_sp2_cd2_X13-68584.iso.txt | 16 ++++
...win_srv_2003_r2_enterprise_x64_cd1.iso.txt | 31 +++++++
...win_srv_2003_r2_enterprise_x64_cd2.iso.txt | 17 ++++
...erprise_x64_with_sp2_cd1_X13-06188.iso.txt | 29 +++++++
...erprise_x64_with_sp2_cd2_X13-68588.iso.txt | 16 ++++
.../en_win_srv_2003_r2_standard_cd1.iso.txt | 29 +++++++
.../en_win_srv_2003_r2_standard_cd2.iso.txt | 16 ++++
...r2_standard_with_sp2_cd1_x13-04790.iso.txt | 31 +++++++
...r2_standard_with_sp2_cd2_x13-68583.iso.txt | 17 ++++
...n_win_srv_2003_r2_standard_x64_cd1.iso.txt | 29 +++++++
...n_win_srv_2003_r2_standard_x64_cd2.iso.txt | 16 ++++
...tandard_x64_with_sp2_cd1_x13-05757.iso.txt | 31 +++++++
...tandard_x64_with_sp2_cd2_x13-68587.iso.txt | 17 ++++
...d_sp2_checked_build_x64_dvd_342435.iso.txt | 29 +++++++
...rprise_standard_sp2_x64_dvd_342336.iso.txt | 29 +++++++
...rprise_standard_sp2_x86_dvd_342333.iso.txt | 29 +++++++
...erprise_standard_x64_dvd_X14-26714.iso.txt | 31 +++++++
...erprise_standard_x86_dvd_X14-26710.iso.txt | 31 +++++++
...erver_2008_with_sp2_x64_dvd_342336.iso.txt | 31 +++++++
...erver_2008_with_sp2_x86_dvd_342333.iso.txt | 31 +++++++
..._web_server_2008_x64_dvd_X14-26683.iso.txt | 31 +++++++
..._web_server_2008_x86_dvd_X14-26678.iso.txt | 31 +++++++
...st_ent_dc_web_retail_x64_X15-50363.img.txt | 31 +++++++
...with_service_pack_1_x64_dvd_700562.iso.txt | 29 +++++++
..._server_2008_r2_hpc_x64_dvd_552761.iso.txt | 31 +++++++
...er_and_web_with_sp1_x64_dvd_617601.iso.txt | 29 +++++++
...tacenter_and_web_x64_dvd_x15-59754.iso.txt | 29 +++++++
...web_retail_build_x64_dvd_x15-50365.iso.txt | 29 +++++++
...nium_based_systems_ia64_dvd_617558.iso.txt | 31 +++++++
...er_2008_r2_with_sp1_x64_dvd_617601.iso.txt | 31 +++++++
...s_server_2008_r2_x64_dvd_x15-50365.iso.txt | 29 +++++++
...st_ent_dc_web_retail_x64_X15-50365.img.txt | 31 +++++++
.../isodata/windows/win7/Win7ProX86.iso.txt | 29 +++++++
...essional_with_sp1_x64_dvd_u_676956.iso.lng | 2 +
...essional_with_sp1_x64_dvd_u_676956.iso.txt | 31 +++++++
...essional_with_sp1_x86_dvd_u_677077.iso.lng | 2 +
...essional_with_sp1_x86_dvd_u_677077.iso.txt | 31 +++++++
...debug_checked_build_dvd_x64_398741.iso.txt | 29 +++++++
...debug_checked_build_dvd_x86_398742.iso.txt | 29 +++++++
...rprise_n_with_sp1_x64_dvd_u_677704.iso.lng | 2 +
...rprise_n_with_sp1_x64_dvd_u_677704.iso.txt | 29 +++++++
...rprise_n_with_sp1_x86_dvd_u_677703.iso.txt | 29 +++++++
...s_7_enterprise_n_x64_dvd_x16-11943.iso.lng | 2 +
...s_7_enterprise_n_x64_dvd_x16-11943.iso.txt | 29 +++++++
...s_7_enterprise_n_x86_dvd_x16-11935.iso.lng | 2 +
...s_7_enterprise_n_x86_dvd_x16-11935.iso.txt | 29 +++++++
...terprise_with_sp1_x64_dvd_u_677651.iso.txt | 29 +++++++
...terprise_with_sp1_x86_dvd_u_677710.iso.txt | 29 +++++++
...ows_7_enterprise_x64_dvd_x15-70749.iso.lng | 2 +
...ows_7_enterprise_x64_dvd_x15-70749.iso.txt | 29 +++++++
...ows_7_enterprise_x86_dvd_x15-70745.iso.lng | 2 +
...ows_7_enterprise_x86_dvd_x15-70745.iso.txt | 29 +++++++
...me_basic_with_sp1_x86_dvd_u_676470.iso.txt | 29 +++++++
...ows_7_home_basic_x86_dvd_x15-65654.iso.txt | 29 +++++++
...remium_n_with_sp1_x64_dvd_u_676825.iso.txt | 29 +++++++
...remium_n_with_sp1_x86_dvd_u_676913.iso.txt | 29 +++++++
...7_home_premium_n_x64_dvd_x16-13459.iso.txt | 29 +++++++
...7_home_premium_n_x86_dvd_x16-13457.iso.txt | 29 +++++++
..._premium_with_sp1_x64_dvd_u_676549.iso.txt | 29 +++++++
..._premium_with_sp1_x86_dvd_u_676701.iso.txt | 29 +++++++
...s_7_home_premium_x64_dvd_x15-65733.iso.txt | 29 +++++++
...s_7_home_premium_x86_dvd_x15-65732.iso.txt | 29 +++++++
...sional_n_with_sp1_x64_dvd_u_677207.iso.txt | 29 +++++++
...sional_n_with_sp1_x86_dvd_u_677328.iso.lng | 2 +
...sional_n_with_sp1_x86_dvd_u_677328.iso.txt | 29 +++++++
...7_professional_n_x64_dvd_x16-13550.iso.txt | 29 +++++++
...7_professional_n_x86_dvd_x16-13548.iso.txt | 29 +++++++
...ssional_vl_build_x64_dvd_x15-71037.iso.txt | 29 +++++++
...ssional_vl_build_x86_dvd_x15-71033.iso.txt | 29 +++++++
...with_sp1_vl_build_x64_dvd_u_677791.iso.txt | 29 +++++++
...with_sp1_vl_build_x86_dvd_u_677896.iso.txt | 29 +++++++
...essional_with_sp1_x64_dvd_u_676939.iso.lng | 2 +
...essional_with_sp1_x64_dvd_u_676939.iso.txt | 29 +++++++
...essional_with_sp1_x86_dvd_u_677056.iso.lng | 2 +
...essional_with_sp1_x86_dvd_u_677056.iso.txt | 29 +++++++
...s_7_professional_x86_dvd_x15-65804.iso.txt | 29 +++++++
...tarter_n_with_sp1_x86_dvd_u_678339.iso.txt | 29 +++++++
...dows_7_starter_n_x86_dvd_x16-15928.iso.txt | 29 +++++++
..._starter_with_sp1_x86_dvd_u_678562.iso.txt | 29 +++++++
...indows_7_starter_x86_dvd_x15-68956.iso.txt | 29 +++++++
...timate_n_with_sp1_x64_dvd_u_677543.iso.txt | 29 +++++++
...timate_n_with_sp1_x86_dvd_u_677597.iso.lng | 2 +
...timate_n_with_sp1_x86_dvd_u_677597.iso.txt | 30 +++++++
...ows_7_ultimate_n_x64_dvd_x16-13641.iso.txt | 29 +++++++
...ows_7_ultimate_n_x86_dvd_x16-13640.iso.txt | 29 +++++++
...ultimate_with_sp1_x64_dvd_u_677332.iso.txt | 29 +++++++
...ultimate_with_sp1_x86_dvd_u_677460.iso.txt | 29 +++++++
...windows_7_ultimate_x64_dvd_unknown.iso.txt | 29 +++++++
.../en_windows_7_ultimate_x64_dvd_unknown.lng | 2 +
...ndows_7_ultimate_x64_dvd_x15-65922.iso.lng | 2 +
...ndows_7_ultimate_x64_dvd_x15-65922.iso.txt | 29 +++++++
...windows_7_ultimate_x86_dvd_unknown.iso.txt | 29 +++++++
.../en_windows_7_ultimate_x86_dvd_unknown.lng | 2 +
...ndows_7_ultimate_x86_dvd_x15-65921.iso.lng | 2 +
...ndows_7_ultimate_x86_dvd_x15-65921.iso.txt | 29 +++++++
...debug_checked_build_x64_dvd_619601.iso.txt | 29 +++++++
...debug_checked_build_x86_dvd_619602.iso.txt | 29 +++++++
...with_sp1_vl_build_x64_dvd_u_677808.iso.lng | 2 +
...with_sp1_vl_build_x64_dvd_u_677808.iso.txt | 29 +++++++
...with_sp1_vl_build_x86_dvd_u_677759.iso.lng | 2 +
...with_sp1_vl_build_x86_dvd_u_677759.iso.txt | 29 +++++++
...remium_n_with_sp1_x64_dvd_u_676833.iso.lng | 2 +
...remium_n_with_sp1_x64_dvd_u_676833.iso.txt | 29 +++++++
...terprise_with_sp1_x64_dvd_u_677671.iso.lng | 2 +
...terprise_with_sp1_x64_dvd_u_677671.iso.txt | 29 +++++++
...ultimate_with_sp1_x86_dvd_u_677463.iso.lng | 2 +
...ultimate_with_sp1_x86_dvd_u_677463.iso.txt | 29 +++++++
...rprise_with_update_x86_dvd_4050369.iso.txt | 29 +++++++
...s_8_1_enterprise_n_x64_dvd_2971847.iso.txt | 29 +++++++
...s_8_1_enterprise_n_x86_dvd_2971852.iso.txt | 29 +++++++
...ows_8_1_enterprise_x64_dvd_2971910.iso.txt | 29 +++++++
...ows_8_1_enterprise_x86_dvd_2972291.iso.txt | 29 +++++++
...n-gb_windows_8_1_n_x64_dvd_2707898.iso.txt | 29 +++++++
...n-gb_windows_8_1_n_x86_dvd_2707897.iso.txt | 29 +++++++
...ndows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt | 29 +++++++
...ndows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt | 29 +++++++
...windows_8_1_pro_vl_x64_dvd_2971955.iso.txt | 29 +++++++
...windows_8_1_pro_vl_x86_dvd_2972634.iso.txt | 29 +++++++
.../en-gb_windows_8_1_x64_dvd_2707421.iso.txt | 29 +++++++
.../en-gb_windows_8_1_x86_dvd_2707543.iso.txt | 29 +++++++
...rise_n_with_update_x64_dvd_4065163.iso.txt | 29 +++++++
...rise_n_with_update_x64_dvd_6050225.iso.txt | 29 +++++++
...rprise_with_update_x64_dvd_6054382.iso.txt | 30 +++++++
..._8.1_n_with_update_x64_dvd_6051677.iso.txt | 29 +++++++
..._8.1_n_with_update_x86_dvd_6051704.iso.txt | 30 +++++++
...o_n_vl_with_update_x64_dvd_6050969.iso.txt | 29 +++++++
...o_n_vl_with_update_x86_dvd_6051127.iso.txt | 29 +++++++
...pro_vl_with_update_x64_dvd_6050880.iso.txt | 29 +++++++
...pro_vl_with_update_x86_dvd_6050918.iso.txt | 29 +++++++
...ws_8.1_with_update_x64_dvd_6051480.iso.txt | 29 +++++++
..._8_1_debug_checked_x64_dvd_2707208.iso.txt | 29 +++++++
..._8_1_debug_checked_x86_dvd_2707387.iso.txt | 29 +++++++
...rise_debug_checked_x64_dvd_2756358.iso.txt | 29 +++++++
...rise_debug_checked_x86_dvd_2756359.iso.txt | 29 +++++++
...se_n_debug_checked_x64_dvd_2942525.iso.txt | 29 +++++++
...se_n_debug_checked_x86_dvd_2942527.iso.txt | 29 +++++++
...s_8_1_enterprise_n_x64_dvd_2791038.iso.txt | 29 +++++++
...s_8_1_enterprise_n_x64_dvd_2971845.iso.txt | 29 +++++++
...s_8_1_enterprise_n_x86_dvd_2791297.iso.txt | 29 +++++++
...s_8_1_enterprise_n_x86_dvd_2971850.iso.txt | 29 +++++++
...ows_8_1_enterprise_x64_dvd_2791088.iso.txt | 29 +++++++
...ows_8_1_enterprise_x64_dvd_2971902.iso.txt | 29 +++++++
...ows_8_1_enterprise_x86_dvd_2791510.iso.txt | 29 +++++++
...ows_8_1_enterprise_x86_dvd_2972289.iso.txt | 29 +++++++
..._1_n_debug_checked_x64_dvd_2707894.iso.txt | 29 +++++++
..._1_n_debug_checked_x86_dvd_2707893.iso.txt | 29 +++++++
..._8_1_n_with_update_x64_dvd_4065114.iso.txt | 29 +++++++
.../en_windows_8_1_n_x64_dvd_2707896.iso.txt | 29 +++++++
.../en_windows_8_1_n_x86_dvd_2707895.iso.txt | 29 +++++++
...ndows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt | 29 +++++++
...ndows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt | 29 +++++++
...ndows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt | 29 +++++++
...ndows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt | 29 +++++++
...windows_8_1_pro_vl_x64_dvd_2791292.iso.txt | 29 +++++++
...windows_8_1_pro_vl_x64_dvd_2971948.iso.txt | 29 +++++++
...windows_8_1_pro_vl_x86_dvd_2791634.iso.txt | 29 +++++++
...windows_8_1_pro_vl_x86_dvd_2972633.iso.txt | 29 +++++++
.../en_windows_8_1_x64_dvd_2707217.iso.txt | 29 +++++++
.../en_windows_8_1_x86_dvd_2707392.iso.txt | 29 +++++++
...ows8-ConsumerPreview-32bit-English.iso.lng | 2 +
...ows8-ConsumerPreview-32bit-English.iso.txt | 29 +++++++
...ows8-ConsumerPreview-64bit-English.iso.lng | 2 +
...ows8-ConsumerPreview-64bit-English.iso.txt | 29 +++++++
...dows_8_enterprise_n_x64_dvd_917975.iso.lng | 2 +
...dows_8_enterprise_n_x64_dvd_917975.iso.txt | 29 +++++++
...dows_8_enterprise_n_x64_dvd_918053.iso.txt | 29 +++++++
...dows_8_enterprise_n_x86_dvd_918708.iso.txt | 29 +++++++
...indows_8_enterprise_x64_dvd_922086.iso.txt | 29 +++++++
...indows_8_enterprise_x86_dvd_917588.iso.txt | 29 +++++++
.../en-gb_windows_8_n_x64_dvd_915799.iso.txt | 29 +++++++
.../en-gb_windows_8_n_x86_dvd_916086.iso.txt | 29 +++++++
..._windows_8_pro_n_vl_x64_dvd_918679.iso.txt | 29 +++++++
..._windows_8_pro_n_vl_x86_dvd_918878.iso.txt | 29 +++++++
...gb_windows_8_pro_vl_x64_dvd_917700.iso.txt | 29 +++++++
...gb_windows_8_pro_vl_x86_dvd_917831.iso.txt | 29 +++++++
.../en-gb_windows_8_x64_dvd_915412.iso.txt | 29 +++++++
.../en-gb_windows_8_x86_dvd_915479.iso.lng | 2 +
.../en-gb_windows_8_x86_dvd_915479.iso.txt | 29 +++++++
...debug_checked_build_x64_dvd_917558.iso.lng | 2 +
...debug_checked_build_x64_dvd_917558.iso.txt | 29 +++++++
...debug_checked_build_x86_dvd_917560.iso.lng | 2 +
...debug_checked_build_x86_dvd_917560.iso.txt | 29 +++++++
...debug_checked_build_x64_dvd_917527.iso.lng | 2 +
...debug_checked_build_x64_dvd_917527.iso.txt | 29 +++++++
...debug_checked_build_x86_dvd_917529.iso.lng | 2 +
...debug_checked_build_x86_dvd_917529.iso.txt | 29 +++++++
...debug_checked_build_x64_dvd_917531.iso.lng | 2 +
...debug_checked_build_x64_dvd_917531.iso.txt | 29 +++++++
...debug_checked_build_x86_dvd_917534.iso.lng | 2 +
...debug_checked_build_x86_dvd_917534.iso.txt | 29 +++++++
...dows_8_enterprise_n_x64_dvd_918052.iso.lng | 2 +
...dows_8_enterprise_n_x64_dvd_918052.iso.txt | 29 +++++++
...dows_8_enterprise_n_x86_dvd_918707.iso.lng | 2 +
...dows_8_enterprise_n_x86_dvd_918707.iso.txt | 29 +++++++
...indows_8_enterprise_x64_dvd_917522.iso.lng | 2 +
...indows_8_enterprise_x64_dvd_917522.iso.txt | 29 +++++++
...indows_8_enterprise_x86_dvd_917587.iso.lng | 2 +
...indows_8_enterprise_x86_dvd_917587.iso.txt | 29 +++++++
...debug_checked_build_x64_dvd_917562.iso.lng | 2 +
...debug_checked_build_x64_dvd_917562.iso.txt | 29 +++++++
...debug_checked_build_x86_dvd_917564.iso.lng | 2 +
...debug_checked_build_x86_dvd_917564.iso.txt | 29 +++++++
.../en_windows_8_n_x64_dvd_916091.iso.lng | 2 +
.../en_windows_8_n_x64_dvd_916091.iso.txt | 29 +++++++
.../en_windows_8_n_x86_dvd_916097.iso.lng | 2 +
.../en_windows_8_n_x86_dvd_916097.iso.txt | 29 +++++++
..._windows_8_pro_n_vl_x64_dvd_918677.iso.lng | 2 +
..._windows_8_pro_n_vl_x64_dvd_918677.iso.txt | 29 +++++++
..._windows_8_pro_n_vl_x86_dvd_918877.iso.lng | 2 +
..._windows_8_pro_n_vl_x86_dvd_918877.iso.txt | 29 +++++++
...en_windows_8_pro_vl_x64_dvd_917699.iso.lng | 2 +
...en_windows_8_pro_vl_x64_dvd_917699.iso.txt | 29 +++++++
...en_windows_8_pro_vl_x86_dvd_917830.iso.lng | 2 +
...en_windows_8_pro_vl_x86_dvd_917830.iso.txt | 29 +++++++
.../win8/en_windows_8_x64_dvd_915440.iso.lng | 2 +
.../win8/en_windows_8_x64_dvd_915440.iso.txt | 29 +++++++
.../win8/en_windows_8_x86_dvd_915417.iso.lng | 2 +
.../win8/en_windows_8_x86_dvd_915417.iso.txt | 29 +++++++
.../win8/fr_windows_8_x86_dvd_915420.iso.lng | 2 +
.../win8/fr_windows_8_x86_dvd_915420.iso.txt | 29 +++++++
..._vista_business_sp2_x64_dvd_342327.iso.txt | 29 +++++++
..._vista_business_sp2_x86_dvd_342321.iso.txt | 31 +++++++
...h_service_pack_1_x64_dvd_x14-56048.iso.txt | 31 +++++++
...h_service_pack_1_x86_dvd_x14-56028.iso.txt | 31 +++++++
...ista_enterprise_sp2_x64_dvd_342332.iso.txt | 29 +++++++
...ista_enterprise_sp2_x86_dvd_342329.iso.txt | 29 +++++++
...ith_service_pack_1_x64_dvd_unknown.iso.txt | 29 +++++++
...h_service_pack_1_x64_dvd_x14-55934.iso.txt | 31 +++++++
...ith_service_pack_1_x86_dvd_unknown.iso.txt | 29 +++++++
...h_service_pack_1_x86_dvd_x14-55954.iso.txt | 31 +++++++
...ith_service_pack_2_beta_x86_288250.iso.txt | 29 +++++++
...nterprise_with_sp2_beta_x64_288254.iso.txt | 29 +++++++
...en_windows_vista_x64_dvd_X12-40712.iso.txt | 31 +++++++
...en_windows_vista_x64_dvd_x12-40712.iso.txt | 29 +++++++
...en_windows_vista_x86_dvd_X12-34293.iso.txt | 31 +++++++
...en_windows_vista_x86_dvd_x12-34293.iso.txt | 29 +++++++
...th_service_pack_3_x86_cd_x14-80416.iso.txt | 31 +++++++
.../winxp/cz_winxp_pro_with_sp2.iso.txt | 31 +++++++
.../en_winXP_Pro_x86_build2600_ISO.img.txt | 31 +++++++
.../windows/winxp/en_win_xp_pro_n.iso.txt | 29 +++++++
...th_service_pack_3_x86_cd_x14-92445.iso.txt | 29 +++++++
...service_pack_3_x86_cd_vl_x14-73974.iso.txt | 29 +++++++
...th_service_pack_3_x86_cd_x14-80428.iso.txt | 29 +++++++
.../en_windows_xp_professional_x64.iso.txt | 29 +++++++
...en_windows_xp_professional_x64_chk.iso.txt | 29 +++++++
.../winxp/en_winxp_mce_2005_cd1.iso.txt | 29 +++++++
.../winxp/en_winxp_mce_2005_cd2.iso.txt | 16 ++++
.../winxp/en_winxp_pro_with_sp2.iso.txt | 29 +++++++
.../winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt | 31 +++++++
.../winxp/en_winxp_tablet_2005_CD1.iso.txt | 31 +++++++
.../winxp/en_winxp_tablet_2005_CD2.iso.txt | 17 ++++
.../windows/winxp/en_winxp_tablet_cd2.iso.txt | 17 ++++
...th_service_pack_3_x86_cd_x14-92426.iso.txt | 29 +++++++
tests/unit/osinfo.py | 40 +++++++++
tests/unit/test_media.py | 65 ++++++++++++--
tests/unit/util.py | 84 +++++++++++++++++++
1515 files changed, 39844 insertions(+), 5 deletions(-)
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-extended-3.5.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-extended-3.5.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-extended-3.5.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-extended-3.5.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-extended-3.5.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-extended-3.5.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-standard-3.5.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-standard-3.5.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-standard-3.5.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-standard-3.5.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-standard-3.5.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-standard-3.5.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-vanilla-3.5.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-vanilla-3.5.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-vanilla-3.5.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-vanilla-3.5.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-vanilla-3.5.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-vanilla-3.5.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-virt-3.5.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-virt-3.5.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-virt-3.5.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-virt-3.5.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-virt-3.5.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-virt-3.5.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-xen-3.5.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-xen-3.5.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.5/alpine-xen-3.5.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-extended-3.6.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-extended-3.6.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-extended-3.6.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-extended-3.6.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-extended-3.6.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-extended-3.6.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-standard-3.6.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-standard-3.6.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-standard-3.6.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-standard-3.6.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-standard-3.6.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-standard-3.6.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-vanilla-3.6.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-vanilla-3.6.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-vanilla-3.6.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-vanilla-3.6.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-vanilla-3.6.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-vanilla-3.6.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-virt-3.6.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-virt-3.6.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-virt-3.6.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-virt-3.6.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-virt-3.6.2-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-virt-3.6.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-xen-3.6.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-xen-3.6.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.6/alpine-xen-3.6.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-extended-3.7.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-extended-3.7.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-standard-3.7.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-standard-3.7.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-vanilla-3.7.0-ppc64le.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-vanilla-3.7.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-vanilla-3.7.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-virt-3.7.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-virt-3.7.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.7/alpine-xen-3.7.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-extended-3.8.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-extended-3.8.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-ppc64le.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-s390x.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.1-ppc64le.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.1-s390x.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-virt-3.8.0-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-virt-3.8.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-virt-3.8.1-x86.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-virt-3.8.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-xen-3.8.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/alpinelinux/alpinelinux3.8/alpine-xen-3.8.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-builder-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-mate-20180913-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-server-20180913-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-server-20180913-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-mate-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.0/alt-education-8.0-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.0/alt-education-8.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.1/alt-workstation-8.1-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.1/alt-workstation-8.1-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-server-8.2-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-server-8.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-simply-8.2.0-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-simply-8.2.0-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-workstation-8.2-i586.iso.txt
create mode 100644 tests/unit/isodata/altlinux/alt8.2/alt-workstation-8.2-x86_64.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux2.4/Master-2.4-install-DVD.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux2.4/Master-2.4-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux3.0/compact-3.0.4.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux3.0/installer-3.0.4.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux3.0/travelcd-3.0.4.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.0-terminal-i586-en-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.0-terminal-i586-ru-dvd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.1-server-i586-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.1-server-x86_64-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.3-desktop-i586-install_en-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.3-desktop-i586-install_ru-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.3-desktop-i586-install_uk-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.3-lite-i586-install_en-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.3-lite-i586-install_ru-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.0/altlinux-4.0.3-lite-i586-install_uk-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.1/altlinux-4.1.1-desktop-i586-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.1/altlinux-4.1.1-desktop-i586-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.1/altlinux-4.1.1-desktop-i586-install_en-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.1/altlinux-4.1.1-desktop-x86_64-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux4.1/altlinux-4.1.1-desktop-x86_64-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux7.0/altlinux-7.0.2-centaurus-i586-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/altlinux/altlinux7.0/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso.txt
create mode 100644 tests/unit/isodata/android-x86/android-x86-8.1/android-x86-8.1-rc2.iso.txt
create mode 100644 tests/unit/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-rc2.iso.txt
create mode 100644 tests/unit/isodata/archlinux/archlinux/archlinux-2019.02.01-x86_64.iso.txt
create mode 100644 tests/unit/isodata/asianux/asianux4.6/asianux-4.6-i386.iso.txt
create mode 100644 tests/unit/isodata/asianux/asianux4.6/asianux-4.6-x86_64.iso.txt
create mode 100644 tests/unit/isodata/asianux/asianux4.7/asianux-4.7-i386.iso.txt
create mode 100644 tests/unit/isodata/asianux/asianux4.7/asianux-4.7-x86_64.iso.txt
create mode 100644 tests/unit/isodata/asianux/asianux7.0/asianux-7.0.iso.txt
create mode 100644 tests/unit/isodata/asianux/asianux7.1/asianux-7.1.iso.txt
create mode 100644 tests/unit/isodata/asianux/asianux7.2/asianux-7.2.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.1/CentOS-6.1-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.1/CentOS-6.1-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-i386-LiveDVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-i386-minimal.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-i386-netinstall.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-x86_64-LiveDVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-x86_64-minimal.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.10/CentOS-6.10-x86_64-netinstall.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.2/CentOS-6.2-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.2/CentOS-6.2-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.3/CentOS-6.3-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.3/CentOS-6.3-x86_64-LiveDVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.3/CentOS-6.3-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.4/CentOS-6.4-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.4/CentOS-6.4-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.5/CentOS-6.5-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.5/CentOS-6.5-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.6/CentOS-6.6-i386-bin-DVD1.iso
create mode 100644 tests/unit/isodata/centos/centos6.6/CentOS-6.6-i386-minimal.iso
create mode 100644 tests/unit/isodata/centos/centos6.6/CentOS-6.6-i386-netinstall.iso
create mode 100644 tests/unit/isodata/centos/centos6.6/CentOS-6.6-x86_64-bin-DVD1.iso
create mode 100644 tests/unit/isodata/centos/centos6.6/CentOS-6.6-x86_64-minimal.iso
create mode 100644 tests/unit/isodata/centos/centos6.6/CentOS-6.6-x86_64-netinstall.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-i386-LiveCD.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-i386-LiveDVD.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-i386-bin-DVD1.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-i386-minimal.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-i386-netinstall.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-x86_64-LiveCD.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-x86_64-LiveDVD.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-x86_64-bin-DVD1.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-x86_64-minimal.iso
create mode 100644 tests/unit/isodata/centos/centos6.7/CentOS-6.7-x86_64-netinstall.iso
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-i386-LiveDVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-i386-minimal.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-i386-netinstall.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-x86_64-LiveDVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-x86_64-minimal.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.8/CentOS-6.8-x86_64-netinstall.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-i386-LiveDVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-i386-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-i386-minimal.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-i386-netinstall.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-x86_64-LiveDVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-x86_64-bin-DVD1.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-x86_64-minimal.iso.txt
create mode 100644 tests/unit/isodata/centos/centos6.9/CentOS-6.9-x86_64-netinstall.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-Everything.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-1804.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME-new-volume-id.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-LiveGNOME.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-LiveKDE-1804.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-LiveKDE.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-Minimal.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7-x86_64-NetInstall-1611.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7.0-1406-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/centos/centos7.0/CentOS-7.0-1406-x86_64-Everything.iso.txt
create mode 100644 tests/unit/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian6/debian-6.0.4-i386-CD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian6/debian-6.0.8-amd64-CD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian6/debian-6.0.8-i386-CD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian6/debian-live-6.0.3-i386-standard.iso.txt
create mode 100644 tests/unit/isodata/debian/debian6/debian-live-6.0.8-amd64-standard.iso.txt
create mode 100644 tests/unit/isodata/debian/debian6/debian-live-6.0.8-i386-standard.iso.txt
create mode 100644 tests/unit/isodata/debian/debian7/debian-7.0.0-amd64-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian7/debian-7.0.0-i386-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian7/debian-7.2.0-amd64-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian7/debian-7.2.0-i386-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian7/debian-7.3.0-amd64-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian7/debian-7.3.0-i386-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian8/debian-8.0.0-amd64-CD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-amd64.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-arm64-netinst.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-arm64.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-armhf-netinst.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-armhf.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-i386-netinst.iso.txt
create mode 100644 tests/unit/isodata/debian/debian9/debian-9.0-i386.iso.txt
create mode 100644 tests/unit/isodata/debian/debiantesting/debian-testing-amd64-DVD-1.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.0.0/dfly-x86_64-5.0.0_REL.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.0.1/dfly-x86_64-5.0.1_REL.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.0.2/dfly-x86_64-5.0.2_REL.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.2.0/dfly-x86_64-5.2.0_REL.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.2.1/dfly-x86_64-5.2.1_REL.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.2.2/dfly-x86_64-5.2.2_REL.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.4.0/dfly-x86_64-5.4.0_REL.iso.txt
create mode 100644 tests/unit/isodata/dragonflybsd/dragonflybsd5.4.1/dfly-x86_64-5.4.1_REL.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-041823.base.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-044004.es.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-044248.bn.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-044927.es_GT.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-050141.en.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-054338.ar.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-055726.fr.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-061343.es_MX.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-062519.id.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-064146.th.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-070619.vi.iso.txt
create mode 100644 tests/unit/isodata/eos/eos3.4/eos-eos3.4-amd64-amd64.180515-071821.zh_CN.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora1/yarrow-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora1/yarrow-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora1/yarrow-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora1/yarrow-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/F10-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/F10-i686-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/F10-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/F10-x86_64-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-i386-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-ppc-disc7.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora10/Fedora-10-x86_64-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i386-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-i686-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-ppc-disc7.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora11/Fedora-11-x86_64-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-i686-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-ppc-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-ppc-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-ppc-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-ppc-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-ppc-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-ppc-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora12/Fedora-12-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-i686-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora13/Fedora-13-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i686-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora14/Fedora-14-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora15/Fedora-15-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora15/Fedora-15-i686-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora15/Fedora-15-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora15/Fedora-15-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora15/Fedora-15-x86_64-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora15/Fedora-15-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora16/Fedora-16-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora16/Fedora-16-i686-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora16/Fedora-16-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora16/Fedora-16-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora16/Fedora-16-x86_64-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora16/Fedora-16-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora17/Fedora-17-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora17/Fedora-17-i686-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora17/Fedora-17-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora17/Fedora-17-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora17/Fedora-17-x86_64-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora17/Fedora-17-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora18/Fedora-18-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora18/Fedora-18-i686-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora18/Fedora-18-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora18/Fedora-18-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora18/Fedora-18-x86_64-Live-Desktop.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora18/Fedora-18-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-19-i386-netinst.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-19-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora2/FC2-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-20-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-20-i386-netinst.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-20-ppc64-netinst.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-20-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-20-x86_64-netinst.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-Live-Desktop-i686-20-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-Live-Desktop-x86_64-20-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-Live-KDE-i686-20-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora20/Fedora-Live-KDE-x86_64-20-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Cloud-netinst-i386-21.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Cloud-netinst-x86_64-21.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Live-Workstation-i686-21-5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Live-Workstation-x86_64-21-5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Server-netinst-i386-21.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora21/Fedora-Server-netinst-x86_64-21.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Live-Workstation-i686-22-3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Live-Workstation-x86_64-22-3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Server-DVD-i386-22.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Server-DVD-x86_64-22.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Server-netinst-i386-22.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Server-netinst-x86_64-22.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Workstation-netinst-i386-22.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora22/Fedora-Workstation-netinst-x86_64-22.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Server-dvd-i386-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Server-dvd-x86_64-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Server-netinst-i386-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Server-netinst-x86_64-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Workstation-Live-i386-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Workstation-Live-x86_64-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Workstation-netinst-i386-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora24/Fedora-Workstation-netinst-x86_64-24-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Server-dvd-i386-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Server-dvd-x86_64-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Server-netinst-i386-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Server-netinst-x86_64-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Workstation-Live-i386-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Workstation-Live-x86_64-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Workstation-netinst-i386-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora25/Fedora-Workstation-netinst-x86_64-25-1.3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora26/Fedora-Server-dvd-x86_64-26-1.5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora26/Fedora-Server-netinst-x86_64-26-1.5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora26/Fedora-Workstation-Live-x86_64-26-1.5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora26/Fedora-Workstation-netinst-x86_64-26-1.5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora27/Fedora-Server-dvd-x86_64-27-1.6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora27/Fedora-Server-netinst-x86_64-27-1.6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora27/Fedora-Workstation-Live-x86_64-27-1.6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora27/Fedora-Workstation-netinst-x86_64-27-1.6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora27/Fedora-WorkstationOstree-ostree-x86_64-27-1.6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora28/Fedora-Server-dvd-x86_64-28-1.1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora28/Fedora-Server-netinst-x86_64-28-1.1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora28/Fedora-Workstation-Live-x86_64-28-1.1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora29/Fedora-Everything-netinst-x86_64-29-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora29/Fedora-Server-dvd-x86_64-29-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora29/Fedora-Server-netinst-x86_64-29-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora29/Fedora-Workstation-netinst-x86_64-29-1.2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora3/FC3-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-ppc-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-ppc-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-ppc-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-ppc-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-ppc-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora4/FC4-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-ppc-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-ppc-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-ppc-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-ppc-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-ppc-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora5/FC-5-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-ppc-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-ppc-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-ppc-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-ppc-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-ppc-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-ppc-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora6/FC-6-x86_64-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora7/F-7-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora7/F-7-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora7/F-7-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora7/Fedora-7-KDE-Live-i686.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora7/Fedora-7-KDE-Live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora7/Fedora-7-Live-i686.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora7/Fedora-7-Live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-Live-KDE-i686.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-Live-KDE-x86_64.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-Live-i686.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-Live-ppc.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-Live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora8/Fedora-8-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i386-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i386-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i386-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i386-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i386-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i386-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i686-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-i686-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-ppc-disc7.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-Live-KDE.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-Live.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-disc1.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-disc2.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-disc3.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-disc4.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-disc5.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-disc6.iso.txt
create mode 100644 tests/unit/isodata/fedora/fedora9/Fedora-9-x86_64-disc7.iso.txt
create mode 100644 tests/unit/isodata/fedora/silverblue28/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso.txt
create mode 100644 tests/unit/isodata/fedora/silverblue29/Fedora-Silverblue-ostree-x86_64-29-1.2.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd10.1/FreeBSD-10.1-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd10.2/FreeBSD-10.2-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd10.3/FreeBSD-10.3-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd10.4/FreeBSD-10.4-RELEASE-amd64-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd10.4/FreeBSD-10.4-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd10.4/FreeBSD-10.4-RELEASE-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd10.4/FreeBSD-10.4-RELEASE-i386-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.0/FreeBSD-11.0-RELEASE-amd64-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.0/FreeBSD-11.0-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.0/FreeBSD-11.0-RELEASE-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.0/FreeBSD-11.0-RELEASE-i386-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.1/FreeBSD-11.1-RELEASE-amd64-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.1/FreeBSD-11.1-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.1/FreeBSD-11.1-RELEASE-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.1/FreeBSD-11.1-RELEASE-i386-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-i386-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd12.0/FreeBSD-12.0-RELEASE-amd64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd12.0/FreeBSD-12.0-RELEASE-i386-disc1.iso.txt
create mode 100644 tests/unit/isodata/freebsd/freebsd12.0/FreeBSD-12.0-RELEASE-i386-dvd1.iso.txt
create mode 100644 tests/unit/isodata/freedos/freedos1.2/FD12CD.iso.txt
create mode 100644 tests/unit/isodata/freedos/freedos1.2/FD12LGCY.iso.txt
create mode 100644 tests/unit/isodata/gentoo/gentoo/install-amd64-minimal-20190212T214502Z.iso.txt
create mode 100644 tests/unit/isodata/gentoo/gentoo/install-x86-minimal-20190214T185527Z.iso.txt
create mode 100644 tests/unit/isodata/gnome/gnome3.8/GNOME-3.7.92.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikunightly/haiku-nightly-anyboot-x86_64.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikur1alpha1/haiku-r1alpha1.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikur1alpha2/haiku-r1alpha2-sources.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikur1alpha3/haiku-r1alpha3.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikur1alpha4.1/haiku-r1alpha4.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt
create mode 100644 tests/unit/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia1/mageia-dual-1.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia1/mageia-dvd-1-i586.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia1/mageia-livecd-1-GNOME-europe1-americas-cdrom-i586.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia1/mageia-livecd-1-KDE4-europe1-americas-cdrom-i586.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia2/Mageia-2-dual-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia2/Mageia-2-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-LiveCD-GNOME-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-LiveCD-KDE4-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-LiveDVD-GNOME-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-LiveDVD-GNOME-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-LiveDVD-KDE4-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-LiveDVD-KDE4-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-dual-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia3/Mageia-3-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-LiveCD-GNOME-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-LiveCD-KDE4-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-dual-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-LiveCD-GNOME-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-LiveCD-KDE4-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-LiveDVD-GNOME-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-LiveDVD-GNOME-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-LiveDVD-KDE4-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-LiveDVD-KDE4-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-dual-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia4/Mageia-4.1-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-LiveCD-GNOME-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-LiveCD-KDE4-en-i586-CD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-dual-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia5/Mageia-5-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia6/Mageia-6-LiveDVD-GNOME-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia6/Mageia-6-LiveDVD-Plasma-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia6/Mageia-6-LiveDVD-Xfce-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia6/Mageia-6-LiveDVD-Xfce-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia6/Mageia-6-i586-DVD.iso.txt
create mode 100644 tests/unit/isodata/mageia/mageia6/Mageia-6-x86_64-DVD.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.2/NetBSD-7.1.2-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.2/NetBSD-7.1.2-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.2/NetBSD-7.1.2-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.2/NetBSD-7.1.2-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.2/NetBSD-7.1.2-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1.2/NetBSD-7.1.2-i386.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.2/NetBSD-7.2-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.2/NetBSD-7.2-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.2/NetBSD-7.2-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.2/NetBSD-7.2-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.2/NetBSD-7.2-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd7.2/NetBSD-7.2-i386.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd8.0/NetBSD-8.0-amd64-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd8.0/NetBSD-8.0-amd64-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd8.0/NetBSD-8.0-amd64.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd8.0/NetBSD-8.0-i386-boot-com.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd8.0/NetBSD-8.0-i386-boot.iso.txt
create mode 100644 tests/unit/isodata/netbsd/netbsd8.0/NetBSD-8.0-i386.iso.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.2/openbsd-4.2-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.2/openbsd-4.2-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.3/openbsd-4.3-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.3/openbsd-4.3-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.4/openbsd-4.4-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.4/openbsd-4.4-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.5/openbsd-4.5-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.5/openbsd-4.5-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.8/openbsd-4.8-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.8/openbsd-4.8-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.9/openbsd-4.9-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd4.9/openbsd-4.9-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.0/openbsd-5.0-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.0/openbsd-5.0-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.1/openbsd-5.1-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.1/openbsd-5.1-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.2/openbsd-5.2-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.2/openbsd-5.2-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.3/openbsd-5.3-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.3/openbsd-5.3-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.4/openbsd-5.4-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.4/openbsd-5.4-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.5/openbsd-5.5-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.5/openbsd-5.5-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.6/openbsd-5.6-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.6/openbsd-5.6-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.7/openbsd-5.7-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.7/openbsd-5.7-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.8/openbsd-5.8-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.8/openbsd-5.8-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.9/openbsd-5.9-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd5.9/openbsd-5.9-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.0/openbsd-6.0-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.0/openbsd-6.0-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.1/openbsd-6.1-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.1/openbsd-6.1-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.2/openbsd-6.2-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.2/openbsd-6.2-i386.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.3/openbsd-6.3-amd64.txt
create mode 100644 tests/unit/isodata/openbsd/openbsd6.3/openbsd-6.3-i386.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse12.2/openSUSE-12.2-DVD-i586.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse12.2/openSUSE-12.2-DVD-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse12.3/openSUSE-12.3-DVD-i586.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse12.3/openSUSE-12.3-DVD-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse13.1/openSUSE-13.1-GNOME-Live-i686.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse13.1/openSUSE-13.1-GNOME-Live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse13.1/openSUSE-13.1-KDE-Live-i686.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse13.1/openSUSE-13.1-KDE-Live-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-i586.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-DVD-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-NET-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse42.1/openSUSE-42.1-DVD-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse42.2/openSUSE-Leap-42.2-DVD-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse42.3/openSUSE-Leap-42.3-DVD-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensuse42.3/openSUSE-Leap-42.3-NET-x86_64.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-i586-Current.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-x86_64-Current.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-Kubic-DVD-x86_64-Snapshot20180420-Media.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-NET-i586-Snapshot20180420-Media.iso.txt
create mode 100644 tests/unit/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-NET-x86_64-Snapshot20180420-Media.iso
create mode 100644 tests/unit/isodata/popos/popos17.10/pop-os_amd64_intel_57.iso.txt
create mode 100644 tests/unit/isodata/popos/popos17.10/pop-os_amd64_nvidia_46.iso.txt
create mode 100644 tests/unit/isodata/popos/popos18.04/pop-os_18.04_amd64_intel_32.iso.txt
create mode 100644 tests/unit/isodata/popos/popos18.04/pop-os_18.04_amd64_nvidia_32.iso.txt
create mode 100644 tests/unit/isodata/popos/popos18.10/pop-os_18.10_amd64_intel_3.iso.txt
create mode 100644 tests/unit/isodata/popos/popos18.10/pop-os_18.10_amd64_nvidia_3.iso.txt
create mode 100644 tests/unit/isodata/pureos/pureos8/pureos-8.0-gnome-live_20180904-amd64.hybrid.iso.txt
create mode 100644 tests/unit/isodata/pureos/pureos8/pureos-8.0-gnome-live_20181210-amd64.hybrid.iso.txt
create mode 100644 tests/unit/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190128-amd64.hybrid.iso.txt
create mode 100644 tests/unit/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190210-amd64.hybrid.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.0/RHEL-Atomic-Host-Installer-7.0.0-Beta.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-11.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-12.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-13.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.3/rhel-atomic-installer-7.3.0-3.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.3/rhel-atomic-installer-7.3.1-1.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.3/rhel-atomic-installer-7.3.2-1.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.3/rhel-atomic-installer-7.3.3-1.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel-atomic-7.4/rhel-atomic-installer-7.4.0-1.x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.5/rhel-server-5.5-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.6/rhel-client-5.6-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.6/rhel-client-5.6-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.6/rhel-client-5.6-x86_64-dvd2.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.6/rhel-server-5.6-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.6/rhel-server-5.6-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.7/rhel-client-5.7-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.7/rhel-client-5.7-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.7/rhel-client-5.7-x86_64-dvd2.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.7/rhel-server-5.7-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.7/rhel-server-5.7-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.8/rhel-5.8-i386.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.8/rhel-5.8-x86_64.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.0/rhel-server-6.0-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.0/rhel-server-6.0-x86_64-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.0/rhel-server-6.0-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.0/rhel-workstation-6.0-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.0/rhel-workstation-6.0-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.1/rhel-client-6.1-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.1/rhel-client-6.1-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.1/rhel-server-6.1-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.1/rhel-server-6.1-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.1/rhel-workstation-6.1-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.1/rhel-workstation-6.1-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.10/RHEL-6.10-20180525.0-Server-i386-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.10/RHEL-6.10-20180525.0-Server-ppc64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.10/RHEL-6.10-20180525.0-Server-s390x-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.10/RHEL-6.10-20180525.0-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.2/rhel-client-6.2-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.2/rhel-client-6.2-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.2/rhel-server-6.2-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.2/rhel-server-6.2-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.2/rhel-workstation-6.2-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.2/rhel-workstation-6.2-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.3/rhel-server-6.3-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.3/rhel-server-6.3-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.3/rhel-workstation-6.3-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.3/rhel-workstation-6.3-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.4/rhel-server-6.4-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.4/rhel-server-6.4-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.4/rhel-workstation-6.4-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.4/rhel-workstation-6.4-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.5/RHEL6.5-20131213.0-Workstation-x86_64-DVD1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.7/rhel-server-6.7-i386-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.7/rhel-server-6.7-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.9/RHEL-6.9-20170309.0-Server-i386-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel6.9/RHEL-6.9-20170309.0-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.0/RHEL-7.0-20140507.0-Client-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.0/RHEL-7.0-20140507.0-ComputeNode-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.0/RHEL-7.0-20140507.0-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.0/RHEL-7.0-20140507.0-Workstation-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.1/RHELSA-7.1-20150616.0-Server-aarch64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.3/RHEL-7.3-20161019.0-Server-aarch64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.3/RHEL-7.3-20161019.0-Server-ppc64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.3/RHEL-7.3-20161019.0-Server-ppc64le-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.3/RHEL-7.3-20161019.0-Server-s390x-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.3/RHEL-7.3-20161019.0-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.4/RHEL-7.4-20170711.0-Server-aarch64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.4/RHEL-7.4-20170711.0-Server-ppc64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.4/RHEL-7.4-20170711.0-Server-ppc64le-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.4/RHEL-7.4-20170711.0-Server-s390x-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.4/RHEL-7.4-20170711.0-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-s390x-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-ppc64-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-ppc64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-ppc64le-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-ppc64le-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-s390x-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-s390x-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-x86_64-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Server-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Workstation-x86_64-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel7.6/RHEL-7.6-20181010.0-Workstation-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-aarch64-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-aarch64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-ppc64le-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-ppc64le-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-s390x-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-s390x-dvd1.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-x86_64-boot.iso.txt
create mode 100644 tests/unit/isodata/rhel/rhel8.0/RHEL-8.0-20181113.1-x86_64-dvd1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp1/SLED-11-SP1-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp1/SLED-11-SP1-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp2/SLED-11-SP2-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp2/SLED-11-SP2-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp3/SLED-11-SP3-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp3/SLED-11-SP3-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp4/SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled11sp4/SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled12/SLE-12-Desktop-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled12sp1/SLE-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled12sp2/SLE-12-SP2-Desktop-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sled/sled12sp3/SLE-12-SP3-Desktop-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp1/SLES-11-SP1-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp1/SLES-11-SP1-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp2/SLES-11-SP2-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp2/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp3/SLES-11-SP3-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp3/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp4/SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles11sp4/SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12/SLE-12-Server-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp1/SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp2/SLE-12-SP2-Server-DVD-aarch64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp2/SLE-12-SP2-Server-DVD-ppc64le-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp2/SLE-12-SP2-Server-DVD-s390x-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp2/SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-aarch64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-ppc64le-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-s390x-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu10.04/ubuntu-10.04.4-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu11.04/ubuntu-11.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.10/ubuntu-12.10-desktop-amd64+mac.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.10/ubuntu-12.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.10/ubuntu-12.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.10/ubuntu-12.10-server-amd64+mac.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.10/ubuntu-12.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu12.10/ubuntu-12.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.04/ubuntu-13.04-beta2-desktop-amd64+mac.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.04/ubuntu-13.04-beta2-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.04/ubuntu-13.04-beta2-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.04/ubuntu-13.04-beta2-server-amd64+mac.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.04/ubuntu-13.04-beta2-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.04/ubuntu-13.04-beta2-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.10/ubuntu-13.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.10/ubuntu-13.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.10/ubuntu-13.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu13.10/ubuntu-13.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.04/ubuntu-14.04.1-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.04/ubuntu-14.04.1-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.04/ubuntu-14.04.1-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.04/ubuntu-14.04.1-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.10/ubuntu-14.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.10/ubuntu-14.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.10/ubuntu-14.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu14.10/ubuntu-14.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.04/ubuntu-15.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.04/ubuntu-15.04-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.04/ubuntu-15.04-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.04/ubuntu-15.04-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-server-arm64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-server-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-server-ppc64el.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu16.10/ubuntu-16.10-server-s390x.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.04/ubuntu-17.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.04/ubuntu-17.04-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.04/ubuntu-17.04-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.04/ubuntu-17.04-server-arm64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.04/ubuntu-17.04-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.04/ubuntu-17.04-server-ppc64el.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.04/ubuntu-17.04-server-s390x.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.10/ubuntu-17.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.10/ubuntu-17.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.10/ubuntu-17.10-server-arm64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.10/ubuntu-17.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.10/ubuntu-17.10-server-ppc64el.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu17.10/ubuntu-17.10-server-s390x.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.04/ubuntu-18.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.04/ubuntu-18.04-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.04/ubuntu-18.04-server-arm64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.04/ubuntu-18.04-server-ppc64el.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.04/ubuntu-18.04-server-s390x.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1.0-live-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.10/cosmic-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.10/cosmic-live-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.10/cosmic-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.10/cosmic-server-arm64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.10/cosmic-server-ppc64el.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu18.10/cosmic-server-s390x.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu19.04/disco-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu19.04/disco-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu19.04/disco-server-arm64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu19.04/disco-server-ppc64el.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu19.04/disco-server-s390x.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.04/ubuntu-5.04-install-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.04/ubuntu-5.04-install-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.04/ubuntu-5.04-install-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.04/ubuntu-5.04-live-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.04/ubuntu-5.04-live-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.04/ubuntu-5.04-live-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-dvd-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-dvd-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-dvd-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-install-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-install-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-install-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-live-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-live-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu5.10/ubuntu-5.10-live-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-alternate-hppa.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-alternate-ia64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-alternate-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-desktop-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-dvd-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-dvd-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-dvd-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-server-hppa.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-server-ia64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-server-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06-server-sparc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-alternate-hppa.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-alternate-ia64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-alternate-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-desktop-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-dvd-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-dvd-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-dvd-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-server-hppa.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-server-ia64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-server-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.1-server-sparc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.2-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.2-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.2-server-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.06/ubuntu-6.06.2-server-sparc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-alternate-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-desktop-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-server-powerpc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu6.10/ubuntu-6.10-server-sparc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.04/ubuntu-7.04-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.04/ubuntu-7.04-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.04/ubuntu-7.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.04/ubuntu-7.04-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.04/ubuntu-7.04-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.04/ubuntu-7.04-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.04/ubuntu-7.04-server-sparc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.10/ubuntu-7.10-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.10/ubuntu-7.10-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.10/ubuntu-7.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.10/ubuntu-7.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.10/ubuntu-7.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.10/ubuntu-7.10-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu7.10/ubuntu-7.10-server-sparc.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-dvd-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-dvd-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.1-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.1-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.1-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.1-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.1-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.1-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.2-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.2-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.2-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.2-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.2-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.2-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.3-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.3-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.3-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.3-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.3-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.3-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.4-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.4-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.4-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.4-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.4-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.04/ubuntu-8.04.4-server-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.10/ubuntu-8.10-alternate-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.10/ubuntu-8.10-alternate-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.10/ubuntu-8.10-desktop-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.10/ubuntu-8.10-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu8.10/ubuntu-8.10-server-amd64.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu9.04/ubuntu-9.04-desktop-i386.iso.txt
create mode 100644 tests/unit/isodata/ubuntu/ubuntu9.04/ubuntu-9.04-server-i386.iso.txt
create mode 100644 tests/unit/isodata/voidlinux/voidlinux/void-live-i686-20181111.iso.txt
create mode 100644 tests/unit/isodata/voidlinux/voidlinux/void-live-x86_64-20181111.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt
create mode 100644 tests/unit/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
create mode 100644 tests/unit/isodata/windows/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k/Win2000S-disk.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
create mode 100644 tests/unit/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_enterprise_x64.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_standard.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_standard_x64.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt
create mode 100644 tests/unit/isodata/windows/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt
create mode 100644 tests/unit/isodata/windows/win7/Win7ProX86.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
create mode 100644 tests/unit/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng
create mode 100644 tests/unit/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
create mode 100644 tests/unit/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.txt
create mode 100644 tests/unit/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.lng
create mode 100644 tests/unit/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
create mode 100644 tests/unit/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/cz_winxp_pro_with_sp2.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_win_xp_pro_n.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winxp_tablet_2005_CD1.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winxp_tablet_2005_CD2.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/en_winxp_tablet_cd2.iso.txt
create mode 100644 tests/unit/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
--
2.20.1
From fidencio at redhat.com Fri Mar 15 15:51:16 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 16:51:16 +0100
Subject: [Libosinfo] [osinfo-db 2/2] test_media: Add detection test
In-Reply-To: <20190315155116.26184-1-fidencio@redhat.com>
References: <20190315155116.26184-1-fidencio@redhat.com>
Message-ID: <20190315155116.26184-3-fidencio@redhat.com>
The detection test is similar to test-isodetect from libosinfo, apart
that it doesn't check for the filled-up languages in the matching media,
as we're not using libosinfo API to actually have a OsinfoMedia entity.
A new dependency has been introduced, python3-regex, as the built-in
regex module for python doesn't cope with POSIX regex (which are used as
part of our db).
Signed-off-by: Fabiano Fid?ncio
---
tests/unit/osinfo.py | 40 +++++++++++++++++++
tests/unit/test_media.py | 65 ++++++++++++++++++++++++++++---
tests/unit/util.py | 84 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 184 insertions(+), 5 deletions(-)
diff --git a/tests/unit/osinfo.py b/tests/unit/osinfo.py
index b2d14c9..0b5e199 100644
--- a/tests/unit/osinfo.py
+++ b/tests/unit/osinfo.py
@@ -35,6 +35,11 @@ class Os():
return shortid.text
shortid = property(_get_shortid)
+ def _get_distro(self):
+ distro = self._root.find('distro')
+ return distro.text
+ distro = property(_get_distro)
+
class Image():
def __init__(self, root):
@@ -57,6 +62,41 @@ class Media():
return URL(url.text)
url = property(_get_url)
+ def _get_iso(self):
+ iso = self._root.find('iso')
+ if iso is not None:
+ return ISO(iso)
+ iso = property(_get_iso)
+
+
+class ISO():
+ def __init__(self, root):
+ self._root = root
+
+ def _get_value(self, name, type=str, default=''):
+ entry = self._root.find(name)
+ return type(entry.text) if entry is not None else default
+
+ def _get_volumeid(self):
+ return self._get_value('volume-id')
+ volumeid = property(_get_volumeid)
+
+ def _get_publisherid(self):
+ return self._get_value('publisher-id')
+ publisherid = property(_get_publisherid)
+
+ def _get_applicationid(self):
+ return self._get_value('application-id')
+ applicationid = property(_get_applicationid)
+
+ def _get_systemid(self):
+ return self._get_value('system-id')
+ systemid = property(_get_systemid)
+
+ def _get_volumesize(self):
+ return self._get_value('volume-size', int, 0)
+ volumesize = property(_get_volumesize)
+
class Tree():
def __init__(self, root):
diff --git a/tests/unit/test_media.py b/tests/unit/test_media.py
index f779aaa..890174e 100644
--- a/tests/unit/test_media.py
+++ b/tests/unit/test_media.py
@@ -2,19 +2,74 @@
import os
import pytest
+import logging
+import regex
from . import util
class TestMedia():
oses = util.oses()
- def os_id(os):
- return os.shortid
+ def os_id(osinfoos):
+ return osinfoos.shortid
- @pytest.mark.parametrize('os', [*oses], ids=os_id)
+ @pytest.mark.parametrize('osinfoos', [*oses], ids=os_id)
@pytest.mark.skipif(os.environ.get('OSINFO_DB_NETWORK_TESTS') is None,
reason='Network related tests are not enabled')
- def test_media_url(self, os):
- for media in os.medias:
+ def test_media_url(self, osinfoos):
+ for media in osinfoos.medias:
if media.url:
assert(media.url.check())
+
+ @pytest.mark.parametrize('osinfoos', [*oses], ids=os_id)
+ def test_media_detection(self, osinfoos):
+ def match_iso(iso, isodata):
+ if iso.volumeid == '' and \
+ iso.systemid == '' and \
+ iso.publisherid == '' and \
+ iso.applicationid == '' and \
+ iso.volumesize == 0:
+ return False
+
+ isovolsize = iso.volumesize
+ if isovolsize == 0:
+ isovolsize = isodata.volumesize
+
+ if bool(regex.match(iso.volumeid, isodata.volumeid)) and \
+ bool(regex.match(iso.publisherid, isodata.publisherid)) and \
+ bool(regex.match(iso.applicationid, isodata.applicationid)) and \
+ bool(regex.match(iso.systemid, isodata.systemid)) and \
+ isovolsize == isodata.volumesize:
+ return True
+ return False
+
+ isodata_medias = util.isodata_medias(osinfoos)
+ medias = osinfoos.medias
+
+ for isodata_media in isodata_medias:
+ detected = []
+ for o in self.oses:
+ for media in o.medias:
+ if match_iso(media.iso, isodata_media):
+ if o.shortid != osinfoos.shortid:
+ logging.warning(
+ 'ISO \'%s\' was matched by OS \'%s\' '
+ 'while it should only be matched by OS '
+ '\'%s\'' %
+ (isodata_media.filename, o.shortid,
+ osinfoos.shortid))
+ else:
+ logging.info('ISO \'%s\' matched by OS \'%s\'' %
+ (isodata_media.filename, o.shortid))
+ # For several distros we do not have the volume-size
+ # set as part of our DB, thus multiple detections may
+ # occur. Although this case is not the optimal, as long
+ # as we detect the very same distro it's okay-ish.
+ if not o.shortid in detected:
+ detected.append(o.shortid)
+
+ if len(detected) != 1:
+ logging.warning('Some ISOs have been matched several times by '
+ 'the different OSes, which indicates an issue '
+ 'in the DB entries.')
+ assert(len(detected) == 1)
diff --git a/tests/unit/util.py b/tests/unit/util.py
index cdb657e..4a6b837 100644
--- a/tests/unit/util.py
+++ b/tests/unit/util.py
@@ -35,3 +35,87 @@ def oses():
for f in files:
oses.append(osinfo.Os(_get_os(f)))
return oses
+
+
+class _IsoDataMedia():
+ def __init__(self, filename, shortid, volumeid, publisherid, systemid,
+ applicationid, volumesize):
+ self.filename = filename
+ self.shortid = shortid
+ self.volumeid = volumeid if volumeid is not None else ''
+ self.publisherid = publisherid if publisherid is not None else ''
+ self.systemid = systemid if systemid is not None else ''
+ self.applicationid = applicationid \
+ if applicationid is not None else ''
+ self.volumesize = volumesize if volumesize is not None else 0
+
+def isodata_medias(osinfoos):
+ def _get_value(string, prefix, type=str):
+ if string.startswith(prefix):
+ return type(string.split(': ')[-1].strip())
+
+ def _get_volumeid(string):
+ return _get_value(string, 'Volume id: ')
+
+ def _get_publisherid(string):
+ return _get_value(string, 'Publisher id: ')
+
+ def _get_systemid(string):
+ return _get_value(string, 'System id: ')
+
+ def _get_applicationid(string):
+ return _get_value(string, 'Application id: ')
+
+ def _get_logicalblock(string):
+ return _get_value(string, 'Logical block size is: ', int)
+
+ def _get_volumesize(string):
+ return _get_value(string, 'Volume size is: ', int)
+
+ def _get_isodatamedia(filepath, shortid):
+ volumeid = None
+ publisherid = None
+ systemid = None
+ applicationid = None
+ logicalblock = None
+ volumesize = None
+
+ with open(filepath, 'r') as f:
+ for line in f.readlines():
+ if volumeid is None:
+ volumeid = _get_volumeid(line)
+ if publisherid is None:
+ publisherid = _get_publisherid(line)
+ if systemid is None:
+ systemid = _get_systemid(line)
+ if applicationid is None:
+ applicationid = _get_applicationid(line)
+ if logicalblock is None:
+ logicalblock = _get_logicalblock(line)
+ if volumesize is None:
+ volumesize = _get_volumesize(line)
+
+ if logicalblock is not None and volumesize is not None:
+ volumesize *= logicalblock
+ else:
+ volumesize = None
+
+ return _IsoDataMedia(filepath, shortid, volumeid, publisherid,
+ systemid, applicationid, volumesize)
+
+ isodata_path = os.path.join(
+ os.path.dirname(os.path.realpath(__file__)),
+ 'isodata')
+ shortid_path = os.path.join(isodata_path,
+ osinfoos.distro, osinfoos.shortid)
+ medias = []
+ if not os.path.exists(shortid_path):
+ return []
+
+ for f in os.listdir(shortid_path):
+ path = os.path.join(shortid_path, f)
+ if not os.path.exists(path):
+ continue
+
+ medias.append(_get_isodatamedia(path, osinfoos.shortid))
+ return medias
--
2.20.1
From fidencio at redhat.com Fri Mar 15 16:01:15 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 17:01:15 +0100
Subject: [Libosinfo] [osinfo-db 0/2] RFC: Add basic tests for osinfo-db
(Part II)
In-Reply-To: <20190315155116.26184-1-fidencio@redhat.com>
References: <20190315155116.26184-1-fidencio@redhat.com>
Message-ID:
On Fri, Mar 15, 2019 at 4:51 PM Fabiano Fid?ncio wrote:
>
> This series, built atop of
> https://www.redhat.com/archives/libosinfo/2019-March/msg00145.html,
> introduces a test for media detection, similar to test-isodetect from
> libosinfo.
>
> I'm pretty sure these patches (including the ones from Part I) could
> have been written in a more pythonic way but, well, changes can be done
> later on.
>
> With Part I and Part II we can get rid of the libosinfo tests that are
> dependent on osinfo-db data.
>
> Fabiano Fid?ncio (2):
> tests: Add the isodata from libosinfo
This patch is way too big for the ML, but it basically adds the whole
content of libosinfo/tests/isodata, with *no* changes, to
osinfo-db/tests/unit/isodata.
Best Regards,
--
Fabiano Fid?ncio
From crobinso at redhat.com Fri Mar 15 21:06:32 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 15 Mar 2019 17:06:32 -0400
Subject: [Libosinfo] [osinfo-db PATCH 0/4] RFC: Add basic tests for
osinfo-db
In-Reply-To: <20190313204430.16677-1-fidencio@redhat.com>
References: <20190313204430.16677-1-fidencio@redhat.com>
Message-ID: <0729ef09-06c8-f9ec-7024-10e8470d1d45@redhat.com>
On 3/13/19 4:44 PM, Fabiano Fid?ncio wrote:
> This series introduces 3 basic tests for osinfo-db that currently are
> part of libosinfo.
>
> The tests chosen for this initial work are the test-*.uris. The
> short-term plan is to move test-isodetect here as well, removing them
> the need of updating libosinfo tests for each new entry added to
> osinfo-db.
>
> As osinfo-db doesn't rely on autotools, some hacks have been in the
> Makefile in order to keep one log file per test.
>
> Fabiano Fid?ncio (4):
> Makefile: Split xmllint from check
> tests: Add media tests
> tests: Add tree tests
> tests: Add image tests
>
Looks like as good of a place to start as any. The tests work fine for
me. There's some pylint issues that should be fixed but they aren't
causing any functional problems that I can tell[1].
Why put code in tests/unit/ and not just tests/ ?
I think we can have a single file and test case for checking all URLs
exist, rather than 3 files, it can be the single entry point we extend
to test more URLs, like driver location= is a candidate (for a later series)
After this series is in, short term test prios IMO:
- Turn the xmllint test into a python test using libxml2 APIs. We did
this in libvirt with tests/virschematest.c, it's much faster and will
give native test output.
- Maybe silence the test output when we are skipping network tests, so
the default invocation doesn't spam a bunch of skip markers. Also if we
convert the XML validation to a test we probably don't want it printing
100s of dots, it's really not that useful feedback for lots of super
quick actions. Pytest has a bunch of output options though so we can
play with it and figure out something optimal
But I'd prefer to do those as follow up patches
- Cole
[1]
************* Module unit.test_tree
unit/test_tree.py:11:14: W0621: Redefining name 'os' from outer scope
(line 3) (redefined-outer-name)
unit/test_tree.py:11:4: E0213: Method should have "self" as first
argument (no-self-argument)
unit/test_tree.py:12:15: E1101: Instance of 'TestTree' has no 'shortid'
member (no-member)
unit/test_tree.py:17:28: W0621: Redefining name 'os' from outer scope
(line 3) (redefined-outer-name)
************* Module unit.test_image
unit/test_image.py:11:14: W0621: Redefining name 'os' from outer scope
(line 3) (redefined-outer-name)
unit/test_image.py:11:4: E0213: Method should have "self" as first
argument (no-self-argument)
unit/test_image.py:12:15: E1101: Instance of 'TestImage' has no
'shortid' member (no-member)
unit/test_image.py:17:29: W0621: Redefining name 'os' from outer scope
(line 3) (redefined-outer-name)
************* Module unit.osinfo
unit/osinfo.py:77:8: W1201: Specify string format arguments as logging
function parameters (logging-not-lazy)
unit/osinfo.py:79:8: W1201: Specify string format arguments as logging
function parameters (logging-not-lazy)
unit/osinfo.py:5:0: C0411: standard import "from http.client import
responses" should be placed before "import requests" (wrong-import-order)
************* Module unit.util
unit/util.py:28:4: W0621: Redefining name 'os' from outer scope (line 4)
(redefined-outer-name)
unit/util.py:32:4: W0621: Redefining name 'oses' from outer scope (line
31) (redefined-outer-name)
unit/util.py:5:0: W0611: Unused import sys (unused-import)
************* Module unit.test_media
unit/test_media.py:11:14: W0621: Redefining name 'os' from outer scope
(line 3) (redefined-outer-name)
unit/test_media.py:11:4: E0213: Method should have "self" as first
argument (no-self-argument)
unit/test_media.py:12:15: E1101: Instance of 'TestMedia' has no
'shortid' member (no-member)
unit/test_media.py:17:29: W0621: Redefining name 'os' from outer scope
(line 3) (redefined-outer-name)
From crobinso at redhat.com Fri Mar 15 21:12:24 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 15 Mar 2019 17:12:24 -0400
Subject: [Libosinfo] [osinfo-db 0/4] Small fixes caught while
implementing osinfo-db tests
In-Reply-To: <20190315091552.1894-1-fidencio@redhat.com>
References: <20190315091552.1894-1-fidencio@redhat.com>
Message-ID: <08be34b8-53bc-d791-50ed-e98d2710bc78@redhat.com>
On 3/15/19 5:15 AM, Fabiano Fid?ncio wrote:
> While adding the tests to osinfo-db I got to fix those in order to have
> everything working as expected there.
>
> For the netbsd and centos patches, I'm not exactly sure why those where
> not caught before by the libosinfo tests, but figuring that out at this
> point is not worth it, as the tests are going to be removed in favour of
> the (coming soon) osinfo-db tests.
>
> Fabiano Fid?ncio (4):
> asianux-7.2: Remove empty system-id tag
> asiaunix-unknown: Simplify the volume-id regex
> netbsd-7.1: Anchor volume-ids
> centos-6.6/centos-6.7: Fix volume-size of the medias
>
> data/os/asianux.com/asianux-7.2.xml.in | 1 -
> data/os/asianux.com/asianux-unknown.xml.in | 2 +-
> data/os/centos.org/centos-6.6.xml.in | 12 ++++++------
> data/os/centos.org/centos-6.7.xml.in | 12 ++++++------
> data/os/netbsd.org/netbsd-7.1.xml.in | 12 ++++++------
> 5 files changed, 19 insertions(+), 20 deletions(-)
>
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Fri Mar 15 21:33:41 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 15 Mar 2019 17:33:41 -0400
Subject: [Libosinfo] [osinfo-db 2/2] test_media: Add detection test
In-Reply-To: <20190315155116.26184-3-fidencio@redhat.com>
References: <20190315155116.26184-1-fidencio@redhat.com>
<20190315155116.26184-3-fidencio@redhat.com>
Message-ID:
On 3/15/19 11:51 AM, Fabiano Fid?ncio wrote:
> The detection test is similar to test-isodetect from libosinfo, apart
> that it doesn't check for the filled-up languages in the matching media,
> as we're not using libosinfo API to actually have a OsinfoMedia entity.
>
> A new dependency has been introduced, python3-regex, as the built-in
> regex module for python doesn't cope with POSIX regex (which are used as
> part of our db).
>
I suggest naming the test file after what it's functionally doing, not
based on the object we are testing. So maybe test_isoinfo.py. Similarly
move the isoinfo stuff out of generic named util.py and into its own
file, probably just into test_isoinfo.py unless there's a clear
different user on the horizon.
> Signed-off-by: Fabiano Fid?ncio
> ---
> tests/unit/osinfo.py | 40 +++++++++++++++++++
> tests/unit/test_media.py | 65 ++++++++++++++++++++++++++++---
> tests/unit/util.py | 84 ++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 184 insertions(+), 5 deletions(-)
>
> diff --git a/tests/unit/osinfo.py b/tests/unit/osinfo.py
> index b2d14c9..0b5e199 100644
> --- a/tests/unit/osinfo.py
> +++ b/tests/unit/osinfo.py
> @@ -35,6 +35,11 @@ class Os():
> return shortid.text
> shortid = property(_get_shortid)
>
> + def _get_distro(self):
> + distro = self._root.find('distro')
> + return distro.text
> + distro = property(_get_distro)
> +
>
> class Image():
> def __init__(self, root):
> @@ -57,6 +62,41 @@ class Media():
> return URL(url.text)
> url = property(_get_url)
>
> + def _get_iso(self):
> + iso = self._root.find('iso')
> + if iso is not None:
> + return ISO(iso)
> + iso = property(_get_iso)
> +
> +
> +class ISO():
> + def __init__(self, root):
> + self._root = root
> +
> + def _get_value(self, name, type=str, default=''):
> + entry = self._root.find(name)
> + return type(entry.text) if entry is not None else default
> +
> + def _get_volumeid(self):
> + return self._get_value('volume-id')
> + volumeid = property(_get_volumeid)
> +
> + def _get_publisherid(self):
> + return self._get_value('publisher-id')
> + publisherid = property(_get_publisherid)
> +
> + def _get_applicationid(self):
> + return self._get_value('application-id')
> + applicationid = property(_get_applicationid)
> +
> + def _get_systemid(self):
> + return self._get_value('system-id')
> + systemid = property(_get_systemid)
> +
> + def _get_volumesize(self):
> + return self._get_value('volume-size', int, 0)
> + volumesize = property(_get_volumesize)
> +
>
> class Tree():
> def __init__(self, root):
> diff --git a/tests/unit/test_media.py b/tests/unit/test_media.py
> index f779aaa..890174e 100644
> --- a/tests/unit/test_media.py
> +++ b/tests/unit/test_media.py
> @@ -2,19 +2,74 @@
>
> import os
> import pytest
> +import logging
> +import regex
Interesting, apparnetly regex is an alternate python regex library
implementation. It's not from the standard library though, that's
'import re', which you can probably just sed replace at it will work
just as well.
Otherwise this looks fine, most important thing is that it works. I
recommend getting a pylint setup though, it will point out certain
things like not using 'type' as a variable name because it overwrites
the global 'type' function in the local scope
- Cole
From fidencio at redhat.com Fri Mar 15 22:51:04 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 15 Mar 2019 23:51:04 +0100
Subject: [Libosinfo] [osinfo-db 2/2] test_media: Add detection test
In-Reply-To:
References: <20190315155116.26184-1-fidencio@redhat.com>
<20190315155116.26184-3-fidencio@redhat.com>
Message-ID:
On Fri, Mar 15, 2019 at 10:33 PM Cole Robinson wrote:
>
> On 3/15/19 11:51 AM, Fabiano Fid?ncio wrote:
> > The detection test is similar to test-isodetect from libosinfo, apart
> > that it doesn't check for the filled-up languages in the matching media,
> > as we're not using libosinfo API to actually have a OsinfoMedia entity.
> >
> > A new dependency has been introduced, python3-regex, as the built-in
> > regex module for python doesn't cope with POSIX regex (which are used as
> > part of our db).
> >
>
> I suggest naming the test file after what it's functionally doing, not
> based on the object we are testing. So maybe test_isoinfo.py. Similarly
> move the isoinfo stuff out of generic named util.py and into its own
> file, probably just into test_isoinfo.py unless there's a clear
> different user on the horizon.
>
> > Signed-off-by: Fabiano Fid?ncio
> > ---
> > tests/unit/osinfo.py | 40 +++++++++++++++++++
> > tests/unit/test_media.py | 65 ++++++++++++++++++++++++++++---
> > tests/unit/util.py | 84 ++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 184 insertions(+), 5 deletions(-)
> >
> > diff --git a/tests/unit/osinfo.py b/tests/unit/osinfo.py
> > index b2d14c9..0b5e199 100644
> > --- a/tests/unit/osinfo.py
> > +++ b/tests/unit/osinfo.py
> > @@ -35,6 +35,11 @@ class Os():
> > return shortid.text
> > shortid = property(_get_shortid)
> >
> > + def _get_distro(self):
> > + distro = self._root.find('distro')
> > + return distro.text
> > + distro = property(_get_distro)
> > +
> >
> > class Image():
> > def __init__(self, root):
> > @@ -57,6 +62,41 @@ class Media():
> > return URL(url.text)
> > url = property(_get_url)
> >
> > + def _get_iso(self):
> > + iso = self._root.find('iso')
> > + if iso is not None:
> > + return ISO(iso)
> > + iso = property(_get_iso)
> > +
> > +
> > +class ISO():
> > + def __init__(self, root):
> > + self._root = root
> > +
> > + def _get_value(self, name, type=str, default=''):
> > + entry = self._root.find(name)
> > + return type(entry.text) if entry is not None else default
> > +
> > + def _get_volumeid(self):
> > + return self._get_value('volume-id')
> > + volumeid = property(_get_volumeid)
> > +
> > + def _get_publisherid(self):
> > + return self._get_value('publisher-id')
> > + publisherid = property(_get_publisherid)
> > +
> > + def _get_applicationid(self):
> > + return self._get_value('application-id')
> > + applicationid = property(_get_applicationid)
> > +
> > + def _get_systemid(self):
> > + return self._get_value('system-id')
> > + systemid = property(_get_systemid)
> > +
> > + def _get_volumesize(self):
> > + return self._get_value('volume-size', int, 0)
> > + volumesize = property(_get_volumesize)
> > +
> >
> > class Tree():
> > def __init__(self, root):
> > diff --git a/tests/unit/test_media.py b/tests/unit/test_media.py
> > index f779aaa..890174e 100644
> > --- a/tests/unit/test_media.py
> > +++ b/tests/unit/test_media.py
> > @@ -2,19 +2,74 @@
> >
> > import os
> > import pytest
> > +import logging
> > +import regex
>
> Interesting, apparnetly regex is an alternate python regex library
> implementation. It's not from the standard library though, that's
> 'import re', which you can probably just sed replace at it will work
> just as well.
Kind of. The built-in 're' can't cope with POSIX patterns as
[:alpha:], [:upper:], [:digit:] and I didn't want to invest some time
doing before having at least some feedback about the series.
I'll change the ~20 entries that contain those patterns, and re-submit
then together with v2.
>
> Otherwise this looks fine, most important thing is that it works. I
> recommend getting a pylint setup though, it will point out certain
> things like not using 'type' as a variable name because it overwrites
> the global 'type' function in the local scope
>
> - Cole
From fidencio at redhat.com Mon Mar 18 08:51:24 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 18 Mar 2019 09:51:24 +0100
Subject: [Libosinfo] [osinfo-db 0/3] Get rid of POSIX regex charecter classes
Message-ID: <20190318085127.29169-1-fidencio@redhat.com>
As we're going to introduce our tests on osinfo-db, using python, and
trying to rely as much as possible on python built-in modules, let's
convert the POSIX character classes as "[:upper:]", "[:digit:]", and
"[:alpha:]" by just using what they mean.
It's needed as "re" built-in python module doesn't cope with POSIX
character classes for regular expressions.
Fabiano Fid?ncio (3):
win: Replace [:upper:] by A-Z
win: Replace [:digit:] by 0-9
fedora23: Replace [:alpha:] by A-Za-z
data/os/fedoraproject.org/fedora-23.xml.in | 12 +++++-----
data/os/microsoft.com/win-10.xml.in | 20 ++++++++--------
data/os/microsoft.com/win-2k.xml.in | 2 +-
data/os/microsoft.com/win-2k12.xml.in | 10 ++++----
data/os/microsoft.com/win-2k12r2.xml.in | 10 ++++----
data/os/microsoft.com/win-2k16.xml.in | 6 ++---
data/os/microsoft.com/win-2k3.xml.in | 6 ++---
data/os/microsoft.com/win-2k3r2.xml.in | 4 ++--
data/os/microsoft.com/win-2k8.xml.in | 4 ++--
data/os/microsoft.com/win-2k8r2.xml.in | 4 ++--
data/os/microsoft.com/win-7.xml.in | 28 +++++++++++-----------
data/os/microsoft.com/win-8.1.xml.in | 20 ++++++++--------
data/os/microsoft.com/win-8.xml.in | 20 ++++++++--------
data/os/microsoft.com/win-vista.xml.in | 4 ++--
data/os/microsoft.com/win-xp.xml.in | 4 ++--
15 files changed, 77 insertions(+), 77 deletions(-)
--
2.20.1
From fidencio at redhat.com Mon Mar 18 08:51:25 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 18 Mar 2019 09:51:25 +0100
Subject: [Libosinfo] [osinfo-db 1/3] win: Replace [:upper:] by A-Z
In-Reply-To: <20190318085127.29169-1-fidencio@redhat.com>
References: <20190318085127.29169-1-fidencio@redhat.com>
Message-ID: <20190318085127.29169-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/microsoft.com/win-10.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-2k.xml.in | 2 +-
data/os/microsoft.com/win-2k12.xml.in | 10 ++++-----
data/os/microsoft.com/win-2k12r2.xml.in | 10 ++++-----
data/os/microsoft.com/win-2k16.xml.in | 6 +++---
data/os/microsoft.com/win-2k3.xml.in | 6 +++---
data/os/microsoft.com/win-2k3r2.xml.in | 4 ++--
data/os/microsoft.com/win-2k8.xml.in | 4 ++--
data/os/microsoft.com/win-2k8r2.xml.in | 4 ++--
data/os/microsoft.com/win-7.xml.in | 28 ++++++++++++-------------
data/os/microsoft.com/win-8.1.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-8.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-vista.xml.in | 4 ++--
data/os/microsoft.com/win-xp.xml.in | 4 ++--
14 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index 288bc06..633dcf8 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -32,7 +32,7 @@
(J_)?CEDN?A_X86FRE_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -40,7 +40,7 @@
(J_)?CEDN?A_X64FREE?_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -50,7 +50,7 @@
^(J_)?CEN?A_X86FREV_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -58,7 +58,7 @@
^(J_)?CENN?A_X64FREV_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -68,7 +68,7 @@
(J_)?CESN?N?_X86FREV_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -76,7 +76,7 @@
(J_)?CESN?N?_X64FREV_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -86,7 +86,7 @@
CESE_X86FREE_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -94,7 +94,7 @@
CESE_X64FREE_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -103,14 +103,14 @@
^(J_)?CCSN?A_X86FRE_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
^(J_)?(CCSN?A|C?CCOMA)_X64FREE?_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
diff --git a/data/os/microsoft.com/win-2k.xml.in b/data/os/microsoft.com/win-2k.xml.in
index 9524e2b..ea33ccb 100644
--- a/data/os/microsoft.com/win-2k.xml.in
+++ b/data/os/microsoft.com/win-2k.xml.in
@@ -17,7 +17,7 @@
(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k12.xml.in b/data/os/microsoft.com/win-2k12.xml.in
index b40ee11..6ef098c 100644
--- a/data/os/microsoft.com/win-2k12.xml.in
+++ b/data/os/microsoft.com/win-2k12.xml.in
@@ -35,7 +35,7 @@
(HRM_SSS_X64CHK|HRM_SSS_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -44,7 +44,7 @@
(HRM_SSSO_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -52,7 +52,7 @@
(HRM_SHV_X64CHK|HRM_SHV_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -60,7 +60,7 @@
(HRM_SFST_X64FREO)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -68,7 +68,7 @@
(HRM_SSS_X64FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k12r2.xml.in b/data/os/microsoft.com/win-2k12r2.xml.in
index 7bf7b9c..7ca74d6 100644
--- a/data/os/microsoft.com/win-2k12r2.xml.in
+++ b/data/os/microsoft.com/win-2k12r2.xml.in
@@ -30,7 +30,7 @@
(IRM_SSS_X64FREE?|IRM_SSS_X64CHK|IR3_SSS_X64FREE?|IR5_SSS_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -38,7 +38,7 @@
(IRM_SSSO_X64CHK|IR5_SSSO_X64FREE?|IRM_SSSO_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -46,7 +46,7 @@
(IRM_SHV_X64CHK|IRM_SHV_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -54,7 +54,7 @@
(IR5_SSS_X64FREV|IR2_SSS_X64FREV|IR1_SSS_X64FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -62,7 +62,7 @@
(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in
index a13c628..ef5048f 100644
--- a/data/os/microsoft.com/win-2k16.xml.in
+++ b/data/os/microsoft.com/win-2k16.xml.in
@@ -21,7 +21,7 @@
^(SSS_X64CHK|SSS_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -29,7 +29,7 @@
^(SESS_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -37,7 +37,7 @@
^(SHV_X64CHK|SHV_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k3.xml.in b/data/os/microsoft.com/win-2k3.xml.in
index 5bc543c..b2f631a 100644
--- a/data/os/microsoft.com/win-2k3.xml.in
+++ b/data/os/microsoft.com/win-2k3.xml.in
@@ -22,21 +22,21 @@
(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
(ARMEIFPP|CR0SPI2)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k3r2.xml.in b/data/os/microsoft.com/win-2k3r2.xml.in
index 83fb749..8d49a35 100644
--- a/data/os/microsoft.com/win-2k3r2.xml.in
+++ b/data/os/microsoft.com/win-2k3r2.xml.in
@@ -18,14 +18,14 @@
(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k8.xml.in b/data/os/microsoft.com/win-2k8.xml.in
index ef14532..97c2342 100644
--- a/data/os/microsoft.com/win-2k8.xml.in
+++ b/data/os/microsoft.com/win-2k8.xml.in
@@ -22,14 +22,14 @@
(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k8r2.xml.in b/data/os/microsoft.com/win-2k8r2.xml.in
index 9c5c249..732cbe7 100644
--- a/data/os/microsoft.com/win-2k8r2.xml.in
+++ b/data/os/microsoft.com/win-2k8r2.xml.in
@@ -24,14 +24,14 @@
(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
(GRMSIAIVOL|SRVHPCR2)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-7.xml.in b/data/os/microsoft.com/win-7.xml.in
index 119a744..a094b92 100644
--- a/data/os/microsoft.com/win-7.xml.in
+++ b/data/os/microsoft.com/win-7.xml.in
@@ -42,7 +42,7 @@
(GRMCCHK)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -50,7 +50,7 @@
(GRMCXCHK)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -60,7 +60,7 @@
(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -70,7 +70,7 @@
(GSP1RMCHBFRER|GRMCHBFRER)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -80,7 +80,7 @@
(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -88,7 +88,7 @@
(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -98,7 +98,7 @@
(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GRMCPRFREO)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -106,7 +106,7 @@
(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -116,7 +116,7 @@
(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -124,7 +124,7 @@
(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GSP1RMCNENXVOL)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -134,7 +134,7 @@
(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -142,7 +142,7 @@
(GRMCULXFRER|GSP1RMCNULXFRER|GSP1RMCULXFRER|GRMCNULXFRER)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -151,14 +151,14 @@
(GRMCPRFRER)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index 9294ba0..25f71c7 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -32,7 +32,7 @@
(IRM_CCSN?A_X86CHK)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -40,7 +40,7 @@
(IRM_CCSN?A_X64CHK)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -50,7 +50,7 @@
(IRM_CENN?A_X86CHKV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -58,7 +58,7 @@
(IRM_CENN?A_X64CHKV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -68,7 +68,7 @@
(IR[M15]_CPRN?A_X86FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -76,7 +76,7 @@
(IR[M15]_CPRN?A_X64FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -86,7 +86,7 @@
(IR[M135]_CENN?A_X86FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -94,7 +94,7 @@
(IR[M135]_CENN?A_X64FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -103,14 +103,14 @@
(IR[M35]_CCSN?A_X86FRE)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
(IR[M35]_CCSN?A_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
diff --git a/data/os/microsoft.com/win-8.xml.in b/data/os/microsoft.com/win-8.xml.in
index 900eac4..21cae2f 100644
--- a/data/os/microsoft.com/win-8.xml.in
+++ b/data/os/microsoft.com/win-8.xml.in
@@ -31,14 +31,14 @@
(HB1_CCPA_X86FRE|HRM_CCSN?A_X86FRE)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
(HB1_CCPA_X64FREE?|HRM_CCSN?A_X64FREE?)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -48,7 +48,7 @@
(HRM_CCSN?A_X86CHK)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -56,7 +56,7 @@
(HRM_CCSN?A_X64CHK)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -66,7 +66,7 @@
(HRM_CENN?A_X86FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -74,7 +74,7 @@
(HRM_CENN?A_X64FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -84,7 +84,7 @@
(HRM_CENN?A_X86CHKV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -92,7 +92,7 @@
(HRM_CENN?A_X64CHKV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -102,7 +102,7 @@
(HRM_CPRN?A_X86FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
@@ -110,7 +110,7 @@
(HRM_CPRN?A_X64FREV)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+ [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
diff --git a/data/os/microsoft.com/win-vista.xml.in b/data/os/microsoft.com/win-vista.xml.in
index 770be67..fc269b1 100644
--- a/data/os/microsoft.com/win-vista.xml.in
+++ b/data/os/microsoft.com/win-vista.xml.in
@@ -18,14 +18,14 @@
(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMEXVOL|FRTMEXVOL|FRMBXVOL|FRMCXFRE)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-xp.xml.in b/data/os/microsoft.com/win-xp.xml.in
index f598452..9c8f2db 100644
--- a/data/os/microsoft.com/win-xp.xml.in
+++ b/data/os/microsoft.com/win-xp.xml.in
@@ -23,7 +23,7 @@
(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
@@ -31,7 +31,7 @@
(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_
MICROSOFT CORPORATION
- [[:upper:][:digit:]]*_([[:upper:]]*)
+ [A-Z[:digit:]]*_([A-Z]*)
--
2.20.1
From fidencio at redhat.com Mon Mar 18 08:51:26 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 18 Mar 2019 09:51:26 +0100
Subject: [Libosinfo] [osinfo-db 2/3] win: Replace [:digit:] by 0-9
In-Reply-To: <20190318085127.29169-1-fidencio@redhat.com>
References: <20190318085127.29169-1-fidencio@redhat.com>
Message-ID: <20190318085127.29169-3-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/microsoft.com/win-10.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-2k.xml.in | 2 +-
data/os/microsoft.com/win-2k12.xml.in | 10 ++++-----
data/os/microsoft.com/win-2k12r2.xml.in | 10 ++++-----
data/os/microsoft.com/win-2k16.xml.in | 6 +++---
data/os/microsoft.com/win-2k3.xml.in | 6 +++---
data/os/microsoft.com/win-2k3r2.xml.in | 4 ++--
data/os/microsoft.com/win-2k8.xml.in | 4 ++--
data/os/microsoft.com/win-2k8r2.xml.in | 4 ++--
data/os/microsoft.com/win-7.xml.in | 28 ++++++++++++-------------
data/os/microsoft.com/win-8.1.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-8.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-vista.xml.in | 4 ++--
data/os/microsoft.com/win-xp.xml.in | 4 ++--
14 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index 633dcf8..cac0ea0 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -32,7 +32,7 @@
(J_)?CEDN?A_X86FRE_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -40,7 +40,7 @@
(J_)?CEDN?A_X64FREE?_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -50,7 +50,7 @@
^(J_)?CEN?A_X86FREV_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -58,7 +58,7 @@
^(J_)?CENN?A_X64FREV_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -68,7 +68,7 @@
(J_)?CESN?N?_X86FREV_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -76,7 +76,7 @@
(J_)?CESN?N?_X64FREV_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -86,7 +86,7 @@
CESE_X86FREE_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -94,7 +94,7 @@
CESE_X64FREE_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -103,14 +103,14 @@
^(J_)?CCSN?A_X86FRE_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
^(J_)?(CCSN?A|C?CCOMA)_X64FREE?_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
diff --git a/data/os/microsoft.com/win-2k.xml.in b/data/os/microsoft.com/win-2k.xml.in
index ea33ccb..87e326b 100644
--- a/data/os/microsoft.com/win-2k.xml.in
+++ b/data/os/microsoft.com/win-2k.xml.in
@@ -17,7 +17,7 @@
(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k12.xml.in b/data/os/microsoft.com/win-2k12.xml.in
index 6ef098c..8e02c17 100644
--- a/data/os/microsoft.com/win-2k12.xml.in
+++ b/data/os/microsoft.com/win-2k12.xml.in
@@ -35,7 +35,7 @@
(HRM_SSS_X64CHK|HRM_SSS_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -44,7 +44,7 @@
(HRM_SSSO_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -52,7 +52,7 @@
(HRM_SHV_X64CHK|HRM_SHV_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -60,7 +60,7 @@
(HRM_SFST_X64FREO)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -68,7 +68,7 @@
(HRM_SSS_X64FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k12r2.xml.in b/data/os/microsoft.com/win-2k12r2.xml.in
index 7ca74d6..a472b06 100644
--- a/data/os/microsoft.com/win-2k12r2.xml.in
+++ b/data/os/microsoft.com/win-2k12r2.xml.in
@@ -30,7 +30,7 @@
(IRM_SSS_X64FREE?|IRM_SSS_X64CHK|IR3_SSS_X64FREE?|IR5_SSS_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -38,7 +38,7 @@
(IRM_SSSO_X64CHK|IR5_SSSO_X64FREE?|IRM_SSSO_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -46,7 +46,7 @@
(IRM_SHV_X64CHK|IRM_SHV_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -54,7 +54,7 @@
(IR5_SSS_X64FREV|IR2_SSS_X64FREV|IR1_SSS_X64FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -62,7 +62,7 @@
(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in
index ef5048f..a6b3370 100644
--- a/data/os/microsoft.com/win-2k16.xml.in
+++ b/data/os/microsoft.com/win-2k16.xml.in
@@ -21,7 +21,7 @@
^(SSS_X64CHK|SSS_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -29,7 +29,7 @@
^(SESS_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -37,7 +37,7 @@
^(SHV_X64CHK|SHV_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k3.xml.in b/data/os/microsoft.com/win-2k3.xml.in
index b2f631a..8b64e82 100644
--- a/data/os/microsoft.com/win-2k3.xml.in
+++ b/data/os/microsoft.com/win-2k3.xml.in
@@ -22,21 +22,21 @@
(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
(ARMEIFPP|CR0SPI2)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k3r2.xml.in b/data/os/microsoft.com/win-2k3r2.xml.in
index 8d49a35..ad08488 100644
--- a/data/os/microsoft.com/win-2k3r2.xml.in
+++ b/data/os/microsoft.com/win-2k3r2.xml.in
@@ -18,14 +18,14 @@
(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k8.xml.in b/data/os/microsoft.com/win-2k8.xml.in
index 97c2342..ccc9bc0 100644
--- a/data/os/microsoft.com/win-2k8.xml.in
+++ b/data/os/microsoft.com/win-2k8.xml.in
@@ -22,14 +22,14 @@
(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-2k8r2.xml.in b/data/os/microsoft.com/win-2k8r2.xml.in
index 732cbe7..179da7d 100644
--- a/data/os/microsoft.com/win-2k8r2.xml.in
+++ b/data/os/microsoft.com/win-2k8r2.xml.in
@@ -24,14 +24,14 @@
(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
(GRMSIAIVOL|SRVHPCR2)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-7.xml.in b/data/os/microsoft.com/win-7.xml.in
index a094b92..d4c08f2 100644
--- a/data/os/microsoft.com/win-7.xml.in
+++ b/data/os/microsoft.com/win-7.xml.in
@@ -42,7 +42,7 @@
(GRMCCHK)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -50,7 +50,7 @@
(GRMCXCHK)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -60,7 +60,7 @@
(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -70,7 +70,7 @@
(GSP1RMCHBFRER|GRMCHBFRER)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -80,7 +80,7 @@
(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -88,7 +88,7 @@
(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -98,7 +98,7 @@
(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GRMCPRFREO)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -106,7 +106,7 @@
(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -116,7 +116,7 @@
(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -124,7 +124,7 @@
(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GSP1RMCNENXVOL)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -134,7 +134,7 @@
(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -142,7 +142,7 @@
(GRMCULXFRER|GSP1RMCNULXFRER|GSP1RMCULXFRER|GRMCNULXFRER)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -151,14 +151,14 @@
(GRMCPRFRER)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index 25f71c7..fc1e3a6 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -32,7 +32,7 @@
(IRM_CCSN?A_X86CHK)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -40,7 +40,7 @@
(IRM_CCSN?A_X64CHK)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -50,7 +50,7 @@
(IRM_CENN?A_X86CHKV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -58,7 +58,7 @@
(IRM_CENN?A_X64CHKV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -68,7 +68,7 @@
(IR[M15]_CPRN?A_X86FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -76,7 +76,7 @@
(IR[M15]_CPRN?A_X64FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -86,7 +86,7 @@
(IR[M135]_CENN?A_X86FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -94,7 +94,7 @@
(IR[M135]_CENN?A_X64FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -103,14 +103,14 @@
(IR[M35]_CCSN?A_X86FRE)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
(IR[M35]_CCSN?A_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
diff --git a/data/os/microsoft.com/win-8.xml.in b/data/os/microsoft.com/win-8.xml.in
index 21cae2f..b8a895e 100644
--- a/data/os/microsoft.com/win-8.xml.in
+++ b/data/os/microsoft.com/win-8.xml.in
@@ -31,14 +31,14 @@
(HB1_CCPA_X86FRE|HRM_CCSN?A_X86FRE)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
(HB1_CCPA_X64FREE?|HRM_CCSN?A_X64FREE?)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -48,7 +48,7 @@
(HRM_CCSN?A_X86CHK)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -56,7 +56,7 @@
(HRM_CCSN?A_X64CHK)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -66,7 +66,7 @@
(HRM_CENN?A_X86FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -74,7 +74,7 @@
(HRM_CENN?A_X64FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -84,7 +84,7 @@
(HRM_CENN?A_X86CHKV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -92,7 +92,7 @@
(HRM_CENN?A_X64CHKV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -102,7 +102,7 @@
(HRM_CPRN?A_X86FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
@@ -110,7 +110,7 @@
(HRM_CPRN?A_X64FREV)_
MICROSOFT CORPORATION
- [A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)
+ [A-Z0-9_]*_([A-Z]*-[A-Z]*)
diff --git a/data/os/microsoft.com/win-vista.xml.in b/data/os/microsoft.com/win-vista.xml.in
index fc269b1..219e916 100644
--- a/data/os/microsoft.com/win-vista.xml.in
+++ b/data/os/microsoft.com/win-vista.xml.in
@@ -18,14 +18,14 @@
(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMEXVOL|FRTMEXVOL|FRMBXVOL|FRMCXFRE)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
diff --git a/data/os/microsoft.com/win-xp.xml.in b/data/os/microsoft.com/win-xp.xml.in
index 9c8f2db..a9c841e 100644
--- a/data/os/microsoft.com/win-xp.xml.in
+++ b/data/os/microsoft.com/win-xp.xml.in
@@ -23,7 +23,7 @@
(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
@@ -31,7 +31,7 @@
(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_
MICROSOFT CORPORATION
- [A-Z[:digit:]]*_([A-Z]*)
+ [A-Z0-9]*_([A-Z]*)
--
2.20.1
From fidencio at redhat.com Mon Mar 18 08:51:27 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 18 Mar 2019 09:51:27 +0100
Subject: [Libosinfo] [osinfo-db 3/3] fedora23: Replace [:alpha:] by A-Za-z
In-Reply-To: <20190318085127.29169-1-fidencio@redhat.com>
References: <20190318085127.29169-1-fidencio@redhat.com>
Message-ID: <20190318085127.29169-4-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/fedoraproject.org/fedora-23.xml.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index 9a3ce13..c8b9e5c 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -72,7 +72,7 @@
https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Workstation-netinst-i386-23.iso
- Fedora-WS-23(_[[:alpha:]]*)*-i386
+ Fedora-WS-23(_[A-Za-z]*)*-i386
LINUX
isolinux/vmlinuz
@@ -82,7 +82,7 @@
https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-23.iso
- Fedora-WS-23(_[[:alpha:]]*)*-x86_64
+ Fedora-WS-23(_[A-Za-z]*)*-x86_64
LINUX
isolinux/vmlinuz
@@ -96,7 +96,7 @@
https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-DVD-i386-23.iso
- Fedora-S-23(_[[:alpha:]]*)*-i386
+ Fedora-S-23(_[A-Za-z]*)*-i386
LINUX
" % devname, devline):
+ badlines.append(devline)
+
+ if badlines:
+ raise AssertionError("shortid=%s device lines don't contain a "
+ "comment with the device name:\n%s" %
+ (osxml.shortid, badlines))
+
+
+ at util.os_parametrize('osxml', filter_devices=True)
+def test_devices_duplication(osxml):
+ _check_duplicate_devices(osxml)
+ _check_uncommented_devices(osxml)
diff --git a/tests/util.py b/tests/util.py
index 255a78d..c3dc5d6 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -35,6 +35,7 @@ class _DataFiles():
self.schema = os.path.join(self.datadir, 'schema', 'osinfo.rng')
self._all_xml_cache = []
self._oses_cache = []
+ self._devices_cache = []
self._os_related_cache = defaultdict(list)
if not os.path.exists(self.datadir):
@@ -111,6 +112,12 @@ class _DataFiles():
self._os_related_cache[osxml.internal_id].append(osxml2)
return self._os_related_cache[osxml.internal_id]
+ def devices(self):
+ if not self._devices_cache:
+ for path in self._filter_xml('device'):
+ self._devices_cache.append(osinfo.Device(path))
+ return self._devices_cache
+
def xmls(self):
return self._get_all_xml()
--
2.21.0
From crobinso at redhat.com Mon Mar 25 14:32:17 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Mon, 25 Mar 2019 10:32:17 -0400
Subject: [Libosinfo] [PATCH osinfo-db 13/15] tests: test_isoinfo: improve
output on failure
In-Reply-To:
References:
Message-ID: <29fba1aeea77a42701b885651873027b7f683c66.1553455705.git.crobinso@redhat.com>
This makes it easier to see exactly what test failed, and how
Signed-off-by: Cole Robinson
---
tests/test_isoinfo.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/test_isoinfo.py b/tests/test_isoinfo.py
index 8809126..f5a15ba 100644
--- a/tests/test_isoinfo.py
+++ b/tests/test_isoinfo.py
@@ -55,11 +55,11 @@ def test_iso_detection(testdata):
if osxml2.shortid not in detected:
detected.append(osxml2.shortid)
- if len(detected) != 1:
- logging.warning('Some ISOs have been matched several times by '
- 'the different OSes, which indicates an issue '
- 'in the DB entries.')
- assert len(detected) == 1
+ if detected == [osname]:
+ continue
+
+ raise AssertionError("isodata: %s\nMatched=%s but expected=%s" %
+ (isodatapath, detected, [osname]))
class _ISODataMedia():
--
2.21.0
From crobinso at redhat.com Mon Mar 25 14:32:18 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Mon, 25 Mar 2019 10:32:18 -0400
Subject: [Libosinfo] [PATCH osinfo-db 14/15] tests: Use lxml
In-Reply-To:
References:
Message-ID: <14f58a52776374806371409f4988f8160b998edf.1553455705.git.crobinso@redhat.com>
lxml is a popular XML parsing library that uses libxml2 behind
the scenes and exports an ElementTree API, among other things.
lxml is more python ecosystem friendly as its able to be installed
from pip, unlike python-libxml2, which can help with CI in some cases.
This lets us drop the explicit libxml2 dep, and also makes it easier
to get nicer error messages when XML schema validation fails
Signed-off-by: Cole Robinson
---
tests/osinfo.py | 3 ++-
tests/test_schema.py | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/osinfo.py b/tests/osinfo.py
index ad0eea2..3585f44 100644
--- a/tests/osinfo.py
+++ b/tests/osinfo.py
@@ -2,7 +2,8 @@
# See the COPYING file in the top-level directory.
import re
-import xml.etree.ElementTree as ET
+
+import lxml.etree as ET
def _cache_property(fn):
diff --git a/tests/test_schema.py b/tests/test_schema.py
index 98f58ef..d8d6052 100644
--- a/tests/test_schema.py
+++ b/tests/test_schema.py
@@ -1,18 +1,18 @@
# This work is licensed under the GNU GPLv2 or later.
# See the COPYING file in the top-level directory.
-import libxml2
+import lxml.etree as ET
import pytest
from . import util
SCHEMA = util.DataFiles.schema
-PARSER = libxml2.relaxNGNewParserCtxt(SCHEMA)
-VALID = PARSER.relaxNGParse().relaxNGNewValidCtxt()
+RELAXNG = ET.RelaxNG(ET.parse(SCHEMA))
@pytest.mark.parametrize("path", util.DataFiles.xmls())
def test_schema(path):
- doc = libxml2.parseFile(path)
- assert VALID.relaxNGValidateDoc(doc) == 0
+ if not RELAXNG.validate(ET.parse(path)):
+ # pylint: disable=no-member
+ raise AssertionError(str(RELAXNG.error_log.last_error))
--
2.21.0
From crobinso at redhat.com Mon Mar 25 14:32:19 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Mon, 25 Mar 2019 10:32:19 -0400
Subject: [Libosinfo] [PATCH osinfo-db 15/15] tests: Move isodata parsing to
isodata.py
In-Reply-To:
References:
Message-ID: <9170c3b0a03a0c5d386ce9339f7a6c067d29b8cb.1553455705.git.crobinso@redhat.com>
Upcoming changes will use this from other files, so move it
to a shared location
Signed-off-by: Cole Robinson
---
tests/isodata.py | 91 ++++++++++++++++++++++++++++++++++++++++++
tests/test_isoinfo.py | 92 +------------------------------------------
2 files changed, 93 insertions(+), 90 deletions(-)
create mode 100644 tests/isodata.py
diff --git a/tests/isodata.py b/tests/isodata.py
new file mode 100644
index 0000000..a5face9
--- /dev/null
+++ b/tests/isodata.py
@@ -0,0 +1,91 @@
+# This work is licensed under the GNU GPLv2 or later.
+# See the COPYING file in the top-level directory.
+
+
+class _ISODataMedia():
+ def __init__(self, filename, volumeid, publisherid, systemid,
+ applicationid, volumesize):
+
+ self.filename = filename
+ self.volumeid = volumeid if volumeid is not None else ''
+ self.publisherid = publisherid if publisherid is not None else ''
+ self.systemid = systemid if systemid is not None else ''
+ self.applicationid = applicationid \
+ if applicationid is not None else ''
+ self.volumesize = volumesize if volumesize is not None else 0
+
+ def match(self, media):
+ volumesize = media.volumesize
+ if volumesize == 0:
+ volumesize = self.volumesize
+
+ if bool(media.volumeid.match(self.volumeid)) and \
+ bool(media.publisherid.match(self.publisherid)) and \
+ bool(media.applicationid.match(self.applicationid)) and \
+ bool(media.systemid.match(self.systemid)) and \
+ volumesize == self.volumesize:
+ return True
+
+ return False
+
+
+def _get_value(string, prefix, return_type=str):
+ if string.startswith(prefix):
+ return return_type(string.split(': ')[-1].strip())
+ return None
+
+
+def _get_volumeid(string):
+ return _get_value(string, 'Volume id: ')
+
+
+def _get_publisherid(string):
+ return _get_value(string, 'Publisher id: ')
+
+
+def _get_systemid(string):
+ return _get_value(string, 'System id: ')
+
+
+def _get_applicationid(string):
+ return _get_value(string, 'Application id: ')
+
+
+def _get_logicalblock(string):
+ return _get_value(string, 'Logical block size is: ', int)
+
+
+def _get_volumesize(string):
+ return _get_value(string, 'Volume size is: ', int)
+
+
+def get_isodatamedia(filepath):
+ volumeid = None
+ publisherid = None
+ systemid = None
+ applicationid = None
+ logicalblock = None
+ volumesize = None
+
+ with open(filepath, 'r') as out:
+ for line in out.readlines():
+ if volumeid is None:
+ volumeid = _get_volumeid(line)
+ if publisherid is None:
+ publisherid = _get_publisherid(line)
+ if systemid is None:
+ systemid = _get_systemid(line)
+ if applicationid is None:
+ applicationid = _get_applicationid(line)
+ if logicalblock is None:
+ logicalblock = _get_logicalblock(line)
+ if volumesize is None:
+ volumesize = _get_volumesize(line)
+
+ if logicalblock is not None and volumesize is not None:
+ volumesize *= logicalblock
+ else:
+ volumesize = None
+
+ return _ISODataMedia(filepath, volumeid, publisherid, systemid,
+ applicationid, volumesize)
diff --git a/tests/test_isoinfo.py b/tests/test_isoinfo.py
index f5a15ba..e65e649 100644
--- a/tests/test_isoinfo.py
+++ b/tests/test_isoinfo.py
@@ -7,6 +7,7 @@ import os
import pytest
from . import util
+from . import isodata
def _get_isodatapaths():
@@ -36,7 +37,7 @@ def test_iso_detection(testdata):
continue
detected = []
- isodatamedia = _get_isodatamedia(isodatapath)
+ isodatamedia = isodata.get_isodatamedia(isodatapath)
for osxml2 in util.DataFiles.oses():
for media in osxml2.medias:
if isodatamedia.match(media.iso):
@@ -60,92 +61,3 @@ def test_iso_detection(testdata):
raise AssertionError("isodata: %s\nMatched=%s but expected=%s" %
(isodatapath, detected, [osname]))
-
-
-class _ISODataMedia():
- def __init__(self, filename, volumeid, publisherid, systemid,
- applicationid, volumesize):
-
- self.filename = filename
- self.volumeid = volumeid if volumeid is not None else ''
- self.publisherid = publisherid if publisherid is not None else ''
- self.systemid = systemid if systemid is not None else ''
- self.applicationid = applicationid \
- if applicationid is not None else ''
- self.volumesize = volumesize if volumesize is not None else 0
-
- def match(self, media):
- volumesize = media.volumesize
- if volumesize == 0:
- volumesize = self.volumesize
-
- if bool(media.volumeid.match(self.volumeid)) and \
- bool(media.publisherid.match(self.publisherid)) and \
- bool(media.applicationid.match(self.applicationid)) and \
- bool(media.systemid.match(self.systemid)) and \
- volumesize == self.volumesize:
- return True
-
- return False
-
-
-def _get_value(string, prefix, return_type=str):
- if string.startswith(prefix):
- return return_type(string.split(': ')[-1].strip())
- return None
-
-
-def _get_volumeid(string):
- return _get_value(string, 'Volume id: ')
-
-
-def _get_publisherid(string):
- return _get_value(string, 'Publisher id: ')
-
-
-def _get_systemid(string):
- return _get_value(string, 'System id: ')
-
-
-def _get_applicationid(string):
- return _get_value(string, 'Application id: ')
-
-
-def _get_logicalblock(string):
- return _get_value(string, 'Logical block size is: ', int)
-
-
-def _get_volumesize(string):
- return _get_value(string, 'Volume size is: ', int)
-
-
-def _get_isodatamedia(filepath):
- volumeid = None
- publisherid = None
- systemid = None
- applicationid = None
- logicalblock = None
- volumesize = None
-
- with open(filepath, 'r') as out:
- for line in out.readlines():
- if volumeid is None:
- volumeid = _get_volumeid(line)
- if publisherid is None:
- publisherid = _get_publisherid(line)
- if systemid is None:
- systemid = _get_systemid(line)
- if applicationid is None:
- applicationid = _get_applicationid(line)
- if logicalblock is None:
- logicalblock = _get_logicalblock(line)
- if volumesize is None:
- volumesize = _get_volumesize(line)
-
- if logicalblock is not None and volumesize is not None:
- volumesize *= logicalblock
- else:
- volumesize = None
-
- return _ISODataMedia(filepath, volumeid, publisherid, systemid,
- applicationid, volumesize)
--
2.21.0
From fidencio at redhat.com Mon Mar 25 20:51:43 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Mon, 25 Mar 2019 21:51:43 +0100
Subject: [Libosinfo] [PATCH osinfo-db 00/15] tests: more tweaks
In-Reply-To:
References:
Message-ID:
On Mon, Mar 25, 2019 at 3:32 PM Cole Robinson wrote:
>
> Another collection of test suite tweaks and improvements. FWIW
> I have another small series on top of this that adds a script
> which simplifies adding new test/isodata content, and it uses
> some of the test suite changes here.
>
> Thanks,
> Cole
>
> Cole Robinson (15):
> tests: test_isoinfo: Remove unused function
> tests: Rename test_validation -> test_schema
> tests: test_schema: Drop redundant parametrize ids=
> tests: Use 'osxml' as standard argument name
> tests: Move 'requests' usage to test_urls
> tests: test_urls: Combine the test cases
> tests: test_resources: consolidate to one test case
> tests: Sort input OS/files before testing
> tests: osinfo: Actually use _cache_property as a decorator
> tests: osinfo: Add a base class
> tests: osinfo: Absorb the initial XML parsing
> tests: test_devices: check for device name comment
> tests: test_isoinfo: improve output on failure
> tests: Use lxml
> tests: Move isodata parsing to isodata.py
>
> tests/isodata.py | 91 ++++++++++++++++
> tests/osinfo.py | 219 ++++++++++++++++++---------------------
> tests/test_devices.py | 51 +++++++--
> tests/test_isoinfo.py | 134 +++---------------------
> tests/test_resources.py | 69 +++++-------
> tests/test_schema.py | 18 ++++
> tests/test_urls.py | 57 ++++++----
> tests/test_validation.py | 18 ----
> tests/util.py | 67 ++++++++----
> 9 files changed, 375 insertions(+), 349 deletions(-)
> create mode 100644 tests/isodata.py
> create mode 100644 tests/test_schema.py
> delete mode 100644 tests/test_validation.py
Reviewed-by: Fabiano Fid?ncio
(And pushed!)
>
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
From fidencio at redhat.com Tue Mar 26 12:00:36 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 13:00:36 +0100
Subject: [Libosinfo] [osinfo-db PATCH 1/4] fedora: Split rawhide from unknown
Message-ID: <20190326120039.25046-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.../fedoraproject.org/fedora-rawhide.xml.in | 63 +++++++++++++++++++
.../fedoraproject.org/fedora-unknown.xml.in | 4 +-
2 files changed, 65 insertions(+), 2 deletions(-)
create mode 100644 data/os/fedoraproject.org/fedora-rawhide.xml.in
diff --git a/data/os/fedoraproject.org/fedora-rawhide.xml.in b/data/os/fedoraproject.org/fedora-rawhide.xml.in
new file mode 100644
index 0000000..ca866d8
--- /dev/null
+++ b/data/os/fedoraproject.org/fedora-rawhide.xml.in
@@ -0,0 +1,63 @@
+
+
+
+ rawhide
+ <_name>Fedora Rawhide
+ Rawhide
+ <_vendor>Fedora Project
+ linux
+ fedora
+
+
+ prerelease
+
+
+
+ Fedora-.*-dvd-x86_64-rawh
+
+ isolinux/vmlinuz
+ isolinux/initrd.img
+
+
+
+
+ Fedora-.*-Live-rawh.*
+
+
+
+
+ https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Workstation/x86_64/os
+
+ Fedora
+ Rawhide
+ x86_64
+ Workstation
+
+
+
+
+ https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Server/x86_64/os
+
+ Fedora
+ Rawhide
+ x86_64
+ Server
+
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 2147483648
+ 21474836480
+
+
+
+
diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index 3e084a1..a5f4eb7 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -14,7 +14,7 @@
- Fedora-.*-dvd-x86_64-([3-9][0-9]|rawh)
+ Fedora-.*-dvd-x86_64-[3-9][0-9]
LINUX
isolinux/vmlinuz
@@ -23,7 +23,7 @@
- Fedora-.*-Live-([3-9][0-9]|Rawhide).*
+ Fedora-.*-Live-[3-9][0-9].*
LINUX
--
2.20.1
From fidencio at redhat.com Tue Mar 26 12:00:37 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 13:00:37 +0100
Subject: [Libosinfo] [osinfo-db PATCH 2/4] fedora-unknown: Add tree
information
In-Reply-To: <20190326120039.25046-1-fidencio@redhat.com>
References: <20190326120039.25046-1-fidencio@redhat.com>
Message-ID: <20190326120039.25046-2-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
data/os/fedoraproject.org/fedora-unknown.xml.in | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index a5f4eb7..202e393 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -28,6 +28,14 @@
+
+
+ Fedora
+ [3-9][0-9]
+ x86_64
+
+
+
1
--
2.20.1
From fidencio at redhat.com Tue Mar 26 12:00:38 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 13:00:38 +0100
Subject: [Libosinfo] [osinfo-db PATCH 3/4] opensuse: Add Leap 15.1
In-Reply-To: <20190326120039.25046-1-fidencio@redhat.com>
References: <20190326120039.25046-1-fidencio@redhat.com>
Message-ID: <20190326120039.25046-3-fidencio@redhat.com>
Let's add info about the soon to be released Leap 15.1.
Signed-off-by: Fabiano Fid?ncio
---
data/os/opensuse.org/opensuse-15.1.xml.in | 71 ++++++++++++++++++++
data/os/opensuse.org/opensuse-unknown.xml.in | 6 +-
2 files changed, 74 insertions(+), 3 deletions(-)
create mode 100644 data/os/opensuse.org/opensuse-15.1.xml.in
diff --git a/data/os/opensuse.org/opensuse-15.1.xml.in b/data/os/opensuse.org/opensuse-15.1.xml.in
new file mode 100644
index 0000000..7462a93
--- /dev/null
+++ b/data/os/opensuse.org/opensuse-15.1.xml.in
@@ -0,0 +1,71 @@
+
+
+
+ opensuse15.1
+ <_name>openSUSE Leap 15.1
+ 15.1
+ <_vendor>openSUSE
+ linux
+ opensuse
+
+
+
+ prerelease
+
+
+ <_name>openSUSE Leap 15.1
+
+
+
+
+
+ openSUSE-Leap-15.1-DVD-x86_64*
+ LINUX
+ SUSE LINUX GmbH
+
+ boot/x86_64/loader/linux
+ boot/x86_64/loader/initrd
+
+
+
+
+
+
+ openSUSE-Leap-15.1-NET-x86_64*
+ LINUX
+ SUSE LINUX GmbH
+
+ boot/x86_64/loader/linux
+ boot/x86_64/loader/initrd
+
+
+
+ http://download.opensuse.org/pub/opensuse/distribution/leap/15.1/repo/oss/
+
+ openSUSE Leap
+ 15.1
+ x86_64
+
+
+
+
+
+
+
+
+
+
+ 1600000000
+ 1
+ 1073741824
+ 3221225472
+
+
+ 2400000000
+ 2147483648
+ 17179869184
+
+
+
+
diff --git a/data/os/opensuse.org/opensuse-unknown.xml.in b/data/os/opensuse.org/opensuse-unknown.xml.in
index bdb1d20..d1ec438 100644
--- a/data/os/opensuse.org/opensuse-unknown.xml.in
+++ b/data/os/opensuse.org/opensuse-unknown.xml.in
@@ -8,13 +8,13 @@
<_vendor>openSUSE
linux
opensuse
-
-
+
+
prerelease
- openSUSE-Leap-(15\.[1-9]|(1[6-9]|[23]|[5-9])[0-9]\.[0-9]|4[3-9]\.[0-9])-(DVD|NET|Kubic)-x86_64*
+ openSUSE-Leap-(15\.[2-9]|(1[6-9]|[23]|[5-9])[0-9]\.[0-9]|4[3-9]\.[0-9])-(DVD|NET|Kubic)-x86_64*
LINUX
SUSE LINUX GmbH
--
2.20.1
From fidencio at redhat.com Tue Mar 26 12:00:39 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 13:00:39 +0100
Subject: [Libosinfo] [osinfo-db PATCH 4/4] opensuse: Standardize variant ids
and names
In-Reply-To: <20190326120039.25046-1-fidencio@redhat.com>
References: <20190326120039.25046-1-fidencio@redhat.com>
Message-ID: <20190326120039.25046-4-fidencio@redhat.com>
Let's try to:
- Use "netinst" for whatever is a network installer
- Not add "dvd" variant, as its the "normal" one
- Remove tags differentiating netinst and dvd from its names, as mgmt
apps will already add the needed tags for network installers
Signed-off-by: Fabiano Fid?ncio
---
data/os/opensuse.org/opensuse-15.0.xml.in | 10 +++-------
data/os/opensuse.org/opensuse-42.3.xml.in | 10 +++-------
data/os/opensuse.org/opensuse-tumbleweed.xml.in | 15 +++++----------
3 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/data/os/opensuse.org/opensuse-15.0.xml.in b/data/os/opensuse.org/opensuse-15.0.xml.in
index 4409620..fd86a45 100644
--- a/data/os/opensuse.org/opensuse-15.0.xml.in
+++ b/data/os/opensuse.org/opensuse-15.0.xml.in
@@ -13,16 +13,12 @@
2018-05-25
-
- <_name>openSUSE Leap 15.0 (DVD Image)
-
-
- <_name>openSUSE Leap 15.0 (Network Image)
+
+ <_name>openSUSE Leap 15.0
-
http://download.opensuse.org/distribution/leap/15.0/iso/openSUSE-Leap-15.0-DVD-x86_64.iso
openSUSE-Leap-15.0-DVD-x86_64*
@@ -35,7 +31,7 @@
-
+
http://download.opensuse.org/distribution/leap/15.0/iso/openSUSE-Leap-15.0-NET-x86_64.iso
openSUSE-Leap-15.0-NET-x86_64*
diff --git a/data/os/opensuse.org/opensuse-42.3.xml.in b/data/os/opensuse.org/opensuse-42.3.xml.in
index 69efc9e..5bfee77 100644
--- a/data/os/opensuse.org/opensuse-42.3.xml.in
+++ b/data/os/opensuse.org/opensuse-42.3.xml.in
@@ -14,16 +14,12 @@
2017-07-26
2019-01-31
-
- <_name>openSUSE Leap 42.3 (DVD Image)
-
-
- <_name>openSUSE Leap 42.3 (Network Image)
+
+ <_name>openSUSE Leap 42.3
-
http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-DVD-x86_64.iso
openSUSE-Leap-42.3-DVD-x86_64*
@@ -36,7 +32,7 @@
-
+
http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-NET-x86_64.iso
openSUSE-Leap-42.3-NET-x86_64*
diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
index 0feb783..6e11215 100644
--- a/data/os/opensuse.org/opensuse-tumbleweed.xml.in
+++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
@@ -11,19 +11,15 @@
-
- <_name>openSUSE Tumbleweed (DVD Image)
-
-
- <_name>openSUSE Tumbleweed (Network Image)
+
+ <_name>openSUSE Tumbleweed
- <_name>openSUSE Tumbleweed (Kubic DVD/USB Stick)
+ <_name>openSUSE Tumbleweed (Kubic)
-
http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso
openSUSE-Tumbleweed-DVD-i586*
@@ -34,7 +30,6 @@
boot/i386/loader/initrd
-
http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso
openSUSE-Tumbleweed-DVD-x86_64*
@@ -47,7 +42,7 @@
-
+
http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso
openSUSE-Tumbleweed-NET-i586*
@@ -58,7 +53,7 @@
boot/i386/loader/initrd
-
+
http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso
openSUSE-Tumbleweed-NET-x86_64*
--
2.20.1
From fidencio at redhat.com Tue Mar 26 12:02:56 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 13:02:56 +0100
Subject: [Libosinfo] [libosinfo PATCH] tree: Also check fore "treeinfo" in
addition to ".treeinfo"
Message-ID: <20190326120256.25348-1-fidencio@redhat.com>
Akamai CDN hosted files can't start with a dot, making trees published to
a CDN having their ".treeinfo" files renamed to "treeinfo".
https://gitlab.com/libosinfo/libosinfo/issues/18
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_tree.c | 67 +++++++++++++++++++++++++++++++++-----------
1 file changed, 50 insertions(+), 17 deletions(-)
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 206b78b..55c6aa1 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -35,6 +35,7 @@ typedef struct _CreateFromLocationAsyncData CreateFromLocationAsyncData;
struct _CreateFromLocationAsyncData {
GFile *file;
gchar *location;
+ gchar *treeinfo;
GTask *res;
@@ -617,6 +618,11 @@ static OsinfoTree *load_keyinfo(const gchar *location,
return tree;
}
+static void
+osinfo_tree_create_from_location_async_helper(const gchar *url,
+ const gchar *treeinfo,
+ GCancellable *cancellable,
+ CreateFromLocationAsyncData *data);
static void on_location_read(GObject *source,
GAsyncResult *res,
@@ -636,7 +642,17 @@ static void on_location_read(GObject *source,
&length,
NULL,
&error)) {
- g_prefix_error(&error, _("Failed to load .treeinfo file: "));
+ /* It means no ".treeinfo" file has been found. Try again, this time
+ * looking for a "treeinfo" file. */
+ if (g_str_equal(data->treeinfo, ".treeinfo")) {
+ osinfo_tree_create_from_location_async_helper(data->location,
+ "treeinfo",
+ g_task_get_cancellable(data->res),
+ data);
+ return;
+ }
+
+ g_prefix_error(&error, _("Failed to load .treeinfo|treeinfo file: "));
g_task_return_error(data->res, error);
create_from_location_async_data_free(data);
return;
@@ -658,6 +674,35 @@ static void on_location_read(GObject *source,
g_free(content);
}
+static void
+osinfo_tree_create_from_location_async_helper(const gchar *url,
+ const gchar *treeinfo,
+ GCancellable *cancellable,
+ CreateFromLocationAsyncData *data)
+{
+ gchar *location;
+
+ g_return_if_fail(url != NULL);
+ g_return_if_fail(treeinfo != NULL);
+
+ location = g_strdup_printf("%s/%s", url, treeinfo);
+
+ g_clear_object(&data->file);
+ data->file = g_file_new_for_uri(location);
+
+ g_free(data->location);
+ data->location = g_strdup(url);
+
+ g_free(data->treeinfo);
+ data->treeinfo = g_strdup(treeinfo);
+
+ g_file_load_contents_async(data->file,
+ cancellable,
+ on_location_read,
+ data);
+ g_free(location);
+}
+
/**
* osinfo_tree_create_from_location_async:
* @location: the location of an installation tree
@@ -675,11 +720,6 @@ void osinfo_tree_create_from_location_async(const gchar *location,
gpointer user_data)
{
CreateFromLocationAsyncData *data;
- gchar *treeinfo;
-
- g_return_if_fail(location != NULL);
-
- treeinfo = g_strdup_printf("%s/.treeinfo", location);
data = g_slice_new0(CreateFromLocationAsyncData);
data->res = g_task_new(NULL,
@@ -688,17 +728,10 @@ void osinfo_tree_create_from_location_async(const gchar *location,
user_data);
g_task_set_priority(data->res, priority);
- data->file = g_file_new_for_uri(treeinfo);
- data->location = g_strdup(location);
-
- /* XXX priority ? */
- /* XXX probe other things besides just tree info */
- g_file_load_contents_async(data->file,
- cancellable,
- on_location_read,
- data);
-
- g_free(treeinfo);
+ osinfo_tree_create_from_location_async_helper(location,
+ ".treeinfo",
+ cancellable,
+ data);
}
--
2.20.1
From fidencio at redhat.com Tue Mar 26 12:05:13 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 13:05:13 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/2] tree: Add get_os_variants() API
Message-ID: <20190326120514.25535-1-fidencio@redhat.com>
osinfo-db schema allows that, but libosinfo never really had an API to
support it.
https://gitlab.com/libosinfo/libosinfo/issues/16
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_loader.c | 17 ++++++++-
osinfo/osinfo_os.c | 2 ++
osinfo/osinfo_tree.c | 70 +++++++++++++++++++++++++++++++++++-
osinfo/osinfo_tree.h | 2 ++
osinfo/osinfo_tree_private.h | 29 +++++++++++++++
5 files changed, 118 insertions(+), 2 deletions(-)
create mode 100644 osinfo/osinfo_tree_private.h
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index f71aea9..e30148b 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -1242,9 +1242,24 @@ static OsinfoTree *osinfo_loader_tree(OsinfoLoader *loader,
OsinfoTree *tree = osinfo_tree_new(id, arch);
xmlFree(arch);
+ gint nnodes = osinfo_loader_nodeset("./variant", loader, ctxt, &nodes, err);
+ if (error_is_set(err)) {
+ g_object_unref(tree);
+ return NULL;
+ }
+
+ for (i = 0; i < nnodes; i++) {
+ gchar *variant_id = (gchar *)xmlGetProp(nodes[i], BAD_CAST "id");
+ osinfo_entity_add_param(OSINFO_ENTITY(tree),
+ OSINFO_TREE_PROP_VARIANT,
+ variant_id);
+ xmlFree(variant_id);
+ }
+ g_free(nodes);
+
osinfo_loader_entity(loader, OSINFO_ENTITY(tree), keys, ctxt, root, err);
- gint nnodes = osinfo_loader_nodeset("./treeinfo/*", loader, ctxt, &nodes, err);
+ nnodes = osinfo_loader_nodeset("./treeinfo/*", loader, ctxt, &nodes, err);
if (error_is_set(err)) {
g_object_unref(G_OBJECT(tree));
return NULL;
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index dbea421..a406980 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -28,6 +28,7 @@
#include "osinfo_media_private.h"
#include "osinfo/osinfo_product_private.h"
#include "osinfo/osinfo_resources_private.h"
+#include "osinfo/osinfo_tree_private.h"
#include
G_DEFINE_TYPE(OsinfoOs, osinfo_os, OSINFO_TYPE_PRODUCT);
@@ -673,6 +674,7 @@ void osinfo_os_add_tree(OsinfoOs *os, OsinfoTree *tree)
g_return_if_fail(OSINFO_IS_TREE(tree));
osinfo_list_add(OSINFO_LIST(os->priv->trees), OSINFO_ENTITY(tree));
+ osinfo_tree_set_os(tree, os);
}
/**
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 55c6aa1..1446f53 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -26,6 +26,7 @@
#include
#include
+#include "osinfo_tree_private.h"
#include
#include
#include
@@ -96,7 +97,7 @@ G_DEFINE_TYPE(OsinfoTree, osinfo_tree, OSINFO_TYPE_ENTITY);
struct _OsinfoTreePrivate
{
- gboolean unused;
+ GWeakRef os;
};
enum {
@@ -264,6 +265,15 @@ osinfo_tree_finalize(GObject *object)
G_OBJECT_CLASS(osinfo_tree_parent_class)->finalize(object);
}
+static void osinfo_tree_dispose(GObject *obj)
+{
+ OsinfoTree *tree = OSINFO_TREE(obj);
+
+ g_weak_ref_clear(&tree->priv->os);
+
+ G_OBJECT_CLASS(osinfo_tree_parent_class)->dispose(obj);
+}
+
/* Init functions */
static void
osinfo_tree_class_init(OsinfoTreeClass *klass)
@@ -271,6 +281,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
+ g_klass->dispose = osinfo_tree_dispose;
g_klass->finalize = osinfo_tree_finalize;
g_klass->get_property = osinfo_tree_get_property;
g_klass->set_property = osinfo_tree_set_property;
@@ -411,6 +422,8 @@ static void
osinfo_tree_init(OsinfoTree *tree)
{
tree->priv = OSINFO_TREE_GET_PRIVATE(tree);
+
+ g_weak_ref_init(&tree->priv->os, NULL);
}
OsinfoTree *osinfo_tree_new(const gchar *id,
@@ -918,3 +931,58 @@ gboolean osinfo_tree_has_treeinfo(OsinfoTree *tree)
return osinfo_entity_get_param_value_boolean(OSINFO_ENTITY(tree),
OSINFO_TREE_PROP_HAS_TREEINFO);
}
+
+OsinfoOs *osinfo_tree_get_os(OsinfoTree *tree)
+{
+ g_return_val_if_fail(OSINFO_IS_TREE(tree), NULL);
+
+ return g_weak_ref_get(&tree->priv->os);
+}
+
+void osinfo_tree_set_os(OsinfoTree *tree, OsinfoOs *os)
+{
+ g_return_if_fail(OSINFO_IS_TREE(tree));
+
+ g_object_ref(os);
+ g_weak_ref_set(&tree->priv->os, os);
+ g_object_unref(os);
+}
+
+/**
+ * osinfo_tree_get_os_variant_list:
+ * @tree: an #OsinfoTree instance
+ *
+ * Gets the variants of the associated operating system.
+ *
+ * Returns: (transfer full): the operating system variant, or NULL
+ */
+OsinfoOsVariantList *osinfo_tree_get_os_variants(OsinfoTree *tree)
+{
+ OsinfoOs *os;
+ OsinfoOsVariantList *os_variants;
+ OsinfoOsVariantList *tree_variants;
+ GList *ids, *node;
+ OsinfoFilter *filter;
+
+ g_return_val_if_fail(OSINFO_IS_TREE(tree), NULL);
+ os = osinfo_tree_get_os(tree);
+ os_variants = osinfo_os_get_variant_list(os);
+ g_object_unref(os);
+
+ ids = osinfo_entity_get_param_value_list(OSINFO_ENTITY(tree),
+ OSINFO_TREE_PROP_VARIANT);
+ filter = osinfo_filter_new();
+ tree_variants = osinfo_os_variantlist_new();
+ for (node = ids; node != NULL; node = node->next) {
+ osinfo_filter_clear_constraints(filter);
+ osinfo_filter_add_constraint(filter,
+ OSINFO_ENTITY_PROP_ID,
+ (const char *) node->data);
+ osinfo_list_add_filtered(OSINFO_LIST(tree_variants),
+ OSINFO_LIST(os_variants),
+ filter);
+ }
+ g_object_unref(os_variants);
+
+ return tree_variants;
+}
diff --git a/osinfo/osinfo_tree.h b/osinfo/osinfo_tree.h
index 40a2a29..7ff1840 100644
--- a/osinfo/osinfo_tree.h
+++ b/osinfo/osinfo_tree.h
@@ -62,6 +62,7 @@ typedef struct _OsinfoTreePrivate OsinfoTreePrivate;
#define OSINFO_TREE_PROP_KERNEL "kernel"
#define OSINFO_TREE_PROP_INITRD "initrd"
#define OSINFO_TREE_PROP_HAS_TREEINFO "has-treeinfo"
+#define OSINFO_TREE_PROP_VARIANT "variant"
/* object */
@@ -109,6 +110,7 @@ const gchar *osinfo_tree_get_treeinfo_arch(OsinfoTree *tree);
const gchar *osinfo_tree_get_boot_iso_path(OsinfoTree *tree);
const gchar *osinfo_tree_get_kernel_path(OsinfoTree *tree);
const gchar *osinfo_tree_get_initrd_path(OsinfoTree *tree);
+OsinfoOsVariantList *osinfo_tree_get_os_variants(OsinfoTree *tree);
/* XXX Xen kernel/initrd paths ? */
#endif /* __OSINFO_TREE_H__ */
diff --git a/osinfo/osinfo_tree_private.h b/osinfo/osinfo_tree_private.h
new file mode 100644
index 0000000..7113f98
--- /dev/null
+++ b/osinfo/osinfo_tree_private.h
@@ -0,0 +1,29 @@
+/*
+ * libosinfo: An installation tree for a (guest) OS
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * .
+ */
+
+#include
+
+#ifndef __OSINFO_TREE_PRIVATE_H__
+#define __OSINFO_TREE_PRIVATE_H__
+
+OsinfoOs *osinfo_tree_get_os(OsinfoTree *tree);
+void osinfo_tree_set_os(OsinfoTree *tree, OsinfoOs *os);
+
+#endif /* __OSINFO_TREE_PRIVATE_H__ */
--
2.20.1
From fidencio at redhat.com Tue Mar 26 12:05:14 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 13:05:14 +0100
Subject: [Libosinfo] [libosinfo PATCH 2/2] tests: Add test-tree.c
In-Reply-To: <20190326120514.25535-1-fidencio@redhat.com>
References: <20190326120514.25535-1-fidencio@redhat.com>
Message-ID: <20190326120514.25535-2-fidencio@redhat.com>
This test, at least for now, tests:
- The basic functionality of creating a OsinfoTree object;
- osinfo_tree_get_os_variants() API;
https://gitlab.com/libosinfo/libosinfo/issues/16
Signed-off-by: Fabiano Fid?ncio
---
.gitignore | 1 +
tests/Makefile.am | 5 ++
tests/dbdata/os/libosinfo.org/test-tree.xml | 28 +++++++
tests/test-tree.c | 89 +++++++++++++++++++++
4 files changed, 123 insertions(+)
create mode 100644 tests/dbdata/os/libosinfo.org/test-tree.xml
create mode 100644 tests/test-tree.c
diff --git a/.gitignore b/.gitignore
index 1e87ce7..fb80e9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,7 @@ tests/test-isodetect
tests/test-mediauris
tests/test-treeuris
tests/test-imageuris
+tests/test-tree
tests/*.log
tests/*.trs
build/
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2e92b48..bdd68d3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,7 @@ check_PROGRAMS = \
test-install-script \
test-image \
test-imagelist \
+ test-tree \
$(NULL)
COMMON_LDADD = \
@@ -109,6 +110,10 @@ test_imagelist_LDADD = $(COMMON_LDADD)
test_imagelist_CFLAGS = $(COMMON_CFLAGS)
test_imagelist_SOURCES = test-imagelist.c
+test_tree_LDADD = $(COMMON_LDADD)
+test_tree_CFLAGS = $(COMMON_CFLAGS)
+test_tree_SOURCES = test-tree.c
+
TESTS = $(check_PROGRAMS) \
$(NULL)
diff --git a/tests/dbdata/os/libosinfo.org/test-tree.xml b/tests/dbdata/os/libosinfo.org/test-tree.xml
new file mode 100644
index 0000000..6b2398a
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-tree.xml
@@ -0,0 +1,28 @@
+
+
+
+ db-tree
+ DB Tree
+ unknown
+ libosinfo.org
+ test
+
+
+ DB Tree Foo
+
+
+ DB Tree Bar
+
+
+
+
+ http://libosinfo.org/db/tree/
+
+ Tree
+ unknown
+ ppc64le
+
+
+
+
+
diff --git a/tests/test-tree.c b/tests/test-tree.c
new file mode 100644
index 0000000..eeb1887
--- /dev/null
+++ b/tests/test-tree.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see
+ */
+
+#include
+
+#include
+
+
+static void
+test_basic(void)
+{
+ OsinfoTree *tree = osinfo_tree_new("foo", "x86_64");
+
+ g_assert_true(OSINFO_IS_TREE(tree));
+ g_assert_cmpstr((const char *)osinfo_entity_get_id(OSINFO_ENTITY(tree)), ==, "foo");
+ g_assert_cmpstr((const char *)osinfo_tree_get_architecture(tree), ==, "x86_64");
+
+ g_object_unref(tree);
+}
+
+static void
+test_os_variants(void)
+{
+ OsinfoLoader *loader = osinfo_loader_new();
+ OsinfoDb *db;
+ OsinfoOs *os;
+ OsinfoTree *tree;
+ OsinfoTreeList *list;
+ OsinfoOsVariant *variant;
+ OsinfoOsVariantList *variant_list;
+ gint list_len;
+ GError *error = NULL;
+
+ osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error);
+ g_assert_no_error(error);
+ db = osinfo_loader_get_db(loader);
+
+ os = osinfo_db_get_os(db, "http://libosinfo.org/test/tree");
+
+ list = osinfo_os_get_tree_list(os);
+ list_len = osinfo_list_get_length(OSINFO_LIST(list));
+ g_assert_cmpint(list_len, ==, 1);
+
+ tree = OSINFO_TREE(osinfo_list_get_nth(OSINFO_LIST(list), 0));
+ variant_list = osinfo_tree_get_os_variants(tree);
+ list_len = osinfo_list_get_length(OSINFO_LIST(variant_list));
+ g_assert_cmpint(list_len, ==, 1);
+
+ variant = OSINFO_OS_VARIANT(osinfo_list_get_nth(OSINFO_LIST(variant_list), 0));
+ g_assert_cmpstr(osinfo_entity_get_id(OSINFO_ENTITY(variant)), ==, "bar");
+ g_assert_cmpstr(osinfo_os_variant_get_name(variant), ==, "DB Tree Bar");
+
+ g_object_unref(variant_list);
+ g_object_unref(list);
+ g_object_unref(loader);
+}
+
+int
+main(int argc, char *argv[])
+{
+ g_test_init(&argc, &argv, NULL);
+
+ g_test_add_func("/tree/basic", test_basic);
+ g_test_add_func("/tree/os-variants", test_os_variants);
+
+ /* Upfront so we don't confuse valgrind */
+ osinfo_tree_get_type();
+ osinfo_treelist_get_type();
+ osinfo_os_variantlist_get_type();
+ osinfo_loader_get_type();
+ osinfo_db_get_type();
+ osinfo_os_get_type();
+
+ return g_test_run();
+}
--
2.20.1
From berrange at redhat.com Tue Mar 26 15:26:05 2019
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Tue, 26 Mar 2019 15:26:05 +0000
Subject: [Libosinfo] [osinfo-db PATCH] Only use pytest --log-level arg if it
is supported
Message-ID: <20190326152605.15742-1-berrange@redhat.com>
Older versions of pytest don't have the --log-level arg
Signed-off-by: Daniel P. Berrang?
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 254b7af..c63cb6e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,8 @@ ZANATA = zanata
PYTHON = python3
+PYTEST_LOG_LEVEL = $(shell $(PYTHON) -m pytest --help | grep log-level >/dev/null && echo "--log-level=info")
+
V = 0
V_I18N = $(V_I18N_$(V))
@@ -121,4 +123,4 @@ update-po:
done
check: $(DATA_FILES) $(SCHEMA_FILES)
- $(PYTHON) -m pytest --log-level=info
+ $(PYTHON) -m pytest $(PYTEST_LOG_LEVEL)
--
2.20.1
From fidencio at redhat.com Tue Mar 26 15:30:56 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 16:30:56 +0100
Subject: [Libosinfo] [osinfo-db PATCH] Only use pytest --log-level arg
if it is supported
In-Reply-To: <20190326152605.15742-1-berrange@redhat.com>
References: <20190326152605.15742-1-berrange@redhat.com>
Message-ID:
On Tue, Mar 26, 2019 at 4:26 PM Daniel P. Berrang? wrote:
>
> Older versions of pytest don't have the --log-level arg
>
> Signed-off-by: Daniel P. Berrang?
> ---
> Makefile | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 254b7af..c63cb6e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -34,6 +34,8 @@ ZANATA = zanata
>
> PYTHON = python3
>
> +PYTEST_LOG_LEVEL = $(shell $(PYTHON) -m pytest --help | grep log-level >/dev/null && echo "--log-level=info")
This seems the easiest path to take, indeed.
I'm fine with this but I'd also like to hear from Cole.
[snip]
Best Regards,
--
Fabiano Fid?ncio
From crobinso at redhat.com Tue Mar 26 16:21:02 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 26 Mar 2019 12:21:02 -0400
Subject: [Libosinfo] [osinfo-db PATCH] Only use pytest --log-level arg
if it is supported
In-Reply-To:
References: <20190326152605.15742-1-berrange@redhat.com>
Message-ID: <6569e91f-ed08-5fdf-043b-a610396b7c71@redhat.com>
On 3/26/19 11:30 AM, Fabiano Fid?ncio wrote:
> On Tue, Mar 26, 2019 at 4:26 PM Daniel P. Berrang? wrote:
>>
>> Older versions of pytest don't have the --log-level arg
>>
>> Signed-off-by: Daniel P. Berrang?
>> ---
>> Makefile | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 254b7af..c63cb6e 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -34,6 +34,8 @@ ZANATA = zanata
>>
>> PYTHON = python3
>>
>> +PYTEST_LOG_LEVEL = $(shell $(PYTHON) -m pytest --help | grep log-level >/dev/null && echo "--log-level=info")
>
> This seems the easiest path to take, indeed.
> I'm fine with this but I'd also like to hear from Cole.
>
ACK from me. As I said on IRC I think switching from log.info to plain
print() is better for other reasons as well but we can discuss that
later. This gets us closer to having working CI so let's push it
Thanks,
Cole
From fidencio at redhat.com Tue Mar 26 17:11:45 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 18:11:45 +0100
Subject: [Libosinfo] [libosinfo PATCH] Add a git-publish configuration file
Message-ID: <20190326171145.11256-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.gitpublish | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 .gitpublish
diff --git a/.gitpublish b/.gitpublish
new file mode 100644
index 0000000..ec868cc
--- /dev/null
+++ b/.gitpublish
@@ -0,0 +1,4 @@
+[gitpublishprofile "default"]
+base = master
+to = libosinfo at redhat.com
+prefix = libosinfo PATCH
--
2.20.1
From fidencio at redhat.com Tue Mar 26 17:13:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 18:13:12 +0100
Subject: [Libosinfo] [osinfo-db PATCH] Add a git-publish configuration file
Message-ID: <20190326171312.11692-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.gitpublish | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 .gitpublish
diff --git a/.gitpublish b/.gitpublish
new file mode 100644
index 0000000..3ffc49c
--- /dev/null
+++ b/.gitpublish
@@ -0,0 +1,4 @@
+[gitpublishprofile "default"]
+base = master
+to = libosinfo at redhat.com
+prefix = osinfo-db PATCH
--
2.20.1
From fidencio at redhat.com Tue Mar 26 17:15:06 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 26 Mar 2019 18:15:06 +0100
Subject: [Libosinfo] [osinfo-db-tools PATCH] Add a git-publish configuration
file
Message-ID: <20190326171506.12283-1-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.gitpublish | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 .gitpublish
diff --git a/.gitpublish b/.gitpublish
new file mode 100644
index 0000000..0fe9e9b
--- /dev/null
+++ b/.gitpublish
@@ -0,0 +1,4 @@
+[gitpublishprofile "default"]
+base = master
+to = libosinfo at redhat.com
+prefix = osinfo-db-tools PATCH
--
2.20.1
From berrange at redhat.com Tue Mar 26 17:19:36 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Tue, 26 Mar 2019 17:19:36 +0000
Subject: [Libosinfo] [libosinfo PATCH] Add a git-publish configuration
file
In-Reply-To: <20190326171145.11256-1-fidencio@redhat.com>
References: <20190326171145.11256-1-fidencio@redhat.com>
Message-ID: <20190326171936.GC19150@redhat.com>
On Tue, Mar 26, 2019 at 06:11:45PM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> .gitpublish | 4 ++++
> 1 file changed, 4 insertions(+)
> create mode 100644 .gitpublish
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From berrange at redhat.com Tue Mar 26 17:19:56 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Tue, 26 Mar 2019 17:19:56 +0000
Subject: [Libosinfo] [osinfo-db PATCH] Add a git-publish configuration
file
In-Reply-To: <20190326171312.11692-1-fidencio@redhat.com>
References: <20190326171312.11692-1-fidencio@redhat.com>
Message-ID: <20190326171956.GD19150@redhat.com>
On Tue, Mar 26, 2019 at 06:13:12PM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> .gitpublish | 4 ++++
> 1 file changed, 4 insertions(+)
> create mode 100644 .gitpublish
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From berrange at redhat.com Tue Mar 26 17:21:14 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Tue, 26 Mar 2019 17:21:14 +0000
Subject: [Libosinfo] [osinfo-db-tools PATCH] Add a git-publish
configuration file
In-Reply-To: <20190326171506.12283-1-fidencio@redhat.com>
References: <20190326171506.12283-1-fidencio@redhat.com>
Message-ID: <20190326172114.GE19150@redhat.com>
On Tue, Mar 26, 2019 at 06:15:06PM +0100, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> .gitpublish | 4 ++++
> 1 file changed, 4 insertions(+)
> create mode 100644 .gitpublish
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From fidencio at redhat.com Wed Mar 27 07:46:01 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 08:46:01 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/2] tree: Add get_os_variants()
API
In-Reply-To: <20190326120514.25535-1-fidencio@redhat.com>
References: <20190326120514.25535-1-fidencio@redhat.com>
Message-ID:
On Tue, Mar 26, 2019 at 1:05 PM Fabiano Fid?ncio wrote:
>
> osinfo-db schema allows that, but libosinfo never really had an API to
> support it.
>
> https://gitlab.com/libosinfo/libosinfo/issues/16
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/osinfo_loader.c | 17 ++++++++-
> osinfo/osinfo_os.c | 2 ++
> osinfo/osinfo_tree.c | 70 +++++++++++++++++++++++++++++++++++-
> osinfo/osinfo_tree.h | 2 ++
> osinfo/osinfo_tree_private.h | 29 +++++++++++++++
> 5 files changed, 118 insertions(+), 2 deletions(-)
> create mode 100644 osinfo/osinfo_tree_private.h
>
> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
> index f71aea9..e30148b 100644
> --- a/osinfo/osinfo_loader.c
> +++ b/osinfo/osinfo_loader.c
> @@ -1242,9 +1242,24 @@ static OsinfoTree *osinfo_loader_tree(OsinfoLoader *loader,
> OsinfoTree *tree = osinfo_tree_new(id, arch);
> xmlFree(arch);
>
> + gint nnodes = osinfo_loader_nodeset("./variant", loader, ctxt, &nodes, err);
> + if (error_is_set(err)) {
> + g_object_unref(tree);
> + return NULL;
> + }
> +
> + for (i = 0; i < nnodes; i++) {
> + gchar *variant_id = (gchar *)xmlGetProp(nodes[i], BAD_CAST "id");
> + osinfo_entity_add_param(OSINFO_ENTITY(tree),
> + OSINFO_TREE_PROP_VARIANT,
> + variant_id);
> + xmlFree(variant_id);
> + }
> + g_free(nodes);
> +
> osinfo_loader_entity(loader, OSINFO_ENTITY(tree), keys, ctxt, root, err);
>
> - gint nnodes = osinfo_loader_nodeset("./treeinfo/*", loader, ctxt, &nodes, err);
> + nnodes = osinfo_loader_nodeset("./treeinfo/*", loader, ctxt, &nodes, err);
> if (error_is_set(err)) {
> g_object_unref(G_OBJECT(tree));
> return NULL;
> diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
> index dbea421..a406980 100644
> --- a/osinfo/osinfo_os.c
> +++ b/osinfo/osinfo_os.c
> @@ -28,6 +28,7 @@
> #include "osinfo_media_private.h"
> #include "osinfo/osinfo_product_private.h"
> #include "osinfo/osinfo_resources_private.h"
> +#include "osinfo/osinfo_tree_private.h"
> #include
>
> G_DEFINE_TYPE(OsinfoOs, osinfo_os, OSINFO_TYPE_PRODUCT);
> @@ -673,6 +674,7 @@ void osinfo_os_add_tree(OsinfoOs *os, OsinfoTree *tree)
> g_return_if_fail(OSINFO_IS_TREE(tree));
>
> osinfo_list_add(OSINFO_LIST(os->priv->trees), OSINFO_ENTITY(tree));
> + osinfo_tree_set_os(tree, os);
> }
>
> /**
> diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
> index 55c6aa1..1446f53 100644
> --- a/osinfo/osinfo_tree.c
> +++ b/osinfo/osinfo_tree.c
> @@ -26,6 +26,7 @@
> #include
>
> #include
> +#include "osinfo_tree_private.h"
> #include
> #include
> #include
> @@ -96,7 +97,7 @@ G_DEFINE_TYPE(OsinfoTree, osinfo_tree, OSINFO_TYPE_ENTITY);
>
> struct _OsinfoTreePrivate
> {
> - gboolean unused;
> + GWeakRef os;
> };
>
> enum {
> @@ -264,6 +265,15 @@ osinfo_tree_finalize(GObject *object)
> G_OBJECT_CLASS(osinfo_tree_parent_class)->finalize(object);
> }
>
> +static void osinfo_tree_dispose(GObject *obj)
> +{
> + OsinfoTree *tree = OSINFO_TREE(obj);
> +
> + g_weak_ref_clear(&tree->priv->os);
> +
> + G_OBJECT_CLASS(osinfo_tree_parent_class)->dispose(obj);
> +}
> +
> /* Init functions */
> static void
> osinfo_tree_class_init(OsinfoTreeClass *klass)
> @@ -271,6 +281,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
> GObjectClass *g_klass = G_OBJECT_CLASS(klass);
> GParamSpec *pspec;
>
> + g_klass->dispose = osinfo_tree_dispose;
> g_klass->finalize = osinfo_tree_finalize;
> g_klass->get_property = osinfo_tree_get_property;
> g_klass->set_property = osinfo_tree_set_property;
> @@ -411,6 +422,8 @@ static void
> osinfo_tree_init(OsinfoTree *tree)
> {
> tree->priv = OSINFO_TREE_GET_PRIVATE(tree);
> +
> + g_weak_ref_init(&tree->priv->os, NULL);
> }
>
> OsinfoTree *osinfo_tree_new(const gchar *id,
> @@ -918,3 +931,58 @@ gboolean osinfo_tree_has_treeinfo(OsinfoTree *tree)
> return osinfo_entity_get_param_value_boolean(OSINFO_ENTITY(tree),
> OSINFO_TREE_PROP_HAS_TREEINFO);
> }
> +
> +OsinfoOs *osinfo_tree_get_os(OsinfoTree *tree)
> +{
> + g_return_val_if_fail(OSINFO_IS_TREE(tree), NULL);
> +
> + return g_weak_ref_get(&tree->priv->os);
> +}
> +
> +void osinfo_tree_set_os(OsinfoTree *tree, OsinfoOs *os)
> +{
> + g_return_if_fail(OSINFO_IS_TREE(tree));
> +
> + g_object_ref(os);
> + g_weak_ref_set(&tree->priv->os, os);
> + g_object_unref(os);
> +}
> +
> +/**
> + * osinfo_tree_get_os_variant_list:
> + * @tree: an #OsinfoTree instance
> + *
> + * Gets the variants of the associated operating system.
> + *
> + * Returns: (transfer full): the operating system variant, or NULL
> + */
> +OsinfoOsVariantList *osinfo_tree_get_os_variants(OsinfoTree *tree)
> +{
> + OsinfoOs *os;
> + OsinfoOsVariantList *os_variants;
> + OsinfoOsVariantList *tree_variants;
> + GList *ids, *node;
> + OsinfoFilter *filter;
> +
> + g_return_val_if_fail(OSINFO_IS_TREE(tree), NULL);
> + os = osinfo_tree_get_os(tree);
> + os_variants = osinfo_os_get_variant_list(os);
> + g_object_unref(os);
> +
> + ids = osinfo_entity_get_param_value_list(OSINFO_ENTITY(tree),
> + OSINFO_TREE_PROP_VARIANT);
> + filter = osinfo_filter_new();
> + tree_variants = osinfo_os_variantlist_new();
> + for (node = ids; node != NULL; node = node->next) {
> + osinfo_filter_clear_constraints(filter);
> + osinfo_filter_add_constraint(filter,
> + OSINFO_ENTITY_PROP_ID,
> + (const char *) node->data);
> + osinfo_list_add_filtered(OSINFO_LIST(tree_variants),
> + OSINFO_LIST(os_variants),
> + filter);
> + }
> + g_object_unref(os_variants);
> +
> + return tree_variants;
> +}
> diff --git a/osinfo/osinfo_tree.h b/osinfo/osinfo_tree.h
> index 40a2a29..7ff1840 100644
> --- a/osinfo/osinfo_tree.h
> +++ b/osinfo/osinfo_tree.h
> @@ -62,6 +62,7 @@ typedef struct _OsinfoTreePrivate OsinfoTreePrivate;
> #define OSINFO_TREE_PROP_KERNEL "kernel"
> #define OSINFO_TREE_PROP_INITRD "initrd"
> #define OSINFO_TREE_PROP_HAS_TREEINFO "has-treeinfo"
> +#define OSINFO_TREE_PROP_VARIANT "variant"
>
>
> /* object */
> @@ -109,6 +110,7 @@ const gchar *osinfo_tree_get_treeinfo_arch(OsinfoTree *tree);
> const gchar *osinfo_tree_get_boot_iso_path(OsinfoTree *tree);
> const gchar *osinfo_tree_get_kernel_path(OsinfoTree *tree);
> const gchar *osinfo_tree_get_initrd_path(OsinfoTree *tree);
> +OsinfoOsVariantList *osinfo_tree_get_os_variants(OsinfoTree *tree);
> /* XXX Xen kernel/initrd paths ? */
>
> #endif /* __OSINFO_TREE_H__ */
> diff --git a/osinfo/osinfo_tree_private.h b/osinfo/osinfo_tree_private.h
> new file mode 100644
> index 0000000..7113f98
> --- /dev/null
> +++ b/osinfo/osinfo_tree_private.h
> @@ -0,0 +1,29 @@
> +/*
> + * libosinfo: An installation tree for a (guest) OS
> + *
> + * Copyright (C) 2019 Red Hat, Inc.
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library. If not, see
> + * .
> + */
> +
> +#include
> +
> +#ifndef __OSINFO_TREE_PRIVATE_H__
> +#define __OSINFO_TREE_PRIVATE_H__
> +
> +OsinfoOs *osinfo_tree_get_os(OsinfoTree *tree);
> +void osinfo_tree_set_os(OsinfoTree *tree, OsinfoOs *os);
> +
> +#endif /* __OSINFO_TREE_PRIVATE_H__ */
> --
> 2.20.1
>
The following patch has to be squashed to this one:
fidencio at dahmer ~/src/upstream/libosinfo $ git diff
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index aa8e6d7..14f766e 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -572,6 +572,8 @@ LIBOSINFO_1.5.0 {
global:
osinfo_install_config_get_installation_url;
osinfo_install_config_set_installation_url;
+
+ osinfo_tree_get_os_variants;
} LIBOSINFO_1.4.0;
/* Symbols in next release...
From berrange at redhat.com Wed Mar 27 09:57:06 2019
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Wed, 27 Mar 2019 09:57:06 +0000
Subject: [Libosinfo] [PATCH] force a UTF-8 locale for python3 to avoid
broken ascii codec
Message-ID: <20190327095706.24301-1-berrange@redhat.com>
The python3 ascii codec violates POSIX C locale requirements by not being
8-bit clean in its text handling. It raises an error for any byte with
top bit set
> return codecs.ascii_decode(input, self.errors)[0]
E UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 419: ordinal not in range(128)
To avoid this python bug we must force use of a UTF-8 locale. Ideally we
would use the C.UTF-8 locale, however, that is not portable across OS,
only existing on certain Linux distros. Instead we use the en_us.UTF-8
locale, but only for the character set data.
Signed-off-by: Daniel P. Berrang?
---
Pushed as a CI build fix for FreeBSD distros
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c63cb6e..9d7f109 100644
--- a/Makefile
+++ b/Makefile
@@ -123,4 +123,4 @@ update-po:
done
check: $(DATA_FILES) $(SCHEMA_FILES)
- $(PYTHON) -m pytest $(PYTEST_LOG_LEVEL)
+ LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest $(PYTEST_LOG_LEVEL)
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:22 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:22 +0100
Subject: [Libosinfo] [libosinfo PATCH 0/8] Use "unknown" arch as a fallback
for media/tree detection
Message-ID: <20190327112430.10360-1-fidencio@redhat.com>
This series has been written considering:
- https://www.redhat.com/archives/libosinfo/2019-February/msg00247.html
- a similar patch will be done for medias
Having a fallback or a simple "unknown" architecture type that will be
treated as fallback is, indeed, something needed. In this patch series
I've made sure that if we take this approach, we'll always consider the
"unknown" as the last option to match in order to avoid distros patching
osinfo-db on their side and having it clashing with the "unknown"
definition we may have upstream.
https://gitlab.com/libosinfo/libosinfo/issues/20
Fabiano Fid?ncio (8):
db: Rename tree to treeinfo in guess_os_from_tree()
db: Rename os_* to os_treeinfo_* in guess_os_from_tree()
db: Consider the tree arch when guessing an OS from tree
db: Deal with "unknown" tree architectures
test-db: Add test for guessing tree from OS
db: Consider the media arch when guess an OS from media
db: Deal with "unknown" media architecture
test-db: Add test to cover identifying a media with "unknown" arch
osinfo/osinfo_db.c | 137 +++++++++++++++---
.../dbdata/os/libosinfo.org/test-db-media.xml | 14 ++
tests/test-db.c | 78 ++++++++++
3 files changed, 210 insertions(+), 19 deletions(-)
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:23 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:23 +0100
Subject: [Libosinfo] [libosinfo PATCH 1/8] db: Rename tree to treeinfo in
guess_os_from_tree()
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-2-fidencio@redhat.com>
It'll make clear that we're dealing with the treeinfo attributes and not
with the tree ones.
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index fa217a2..3795903 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -761,18 +761,18 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
OsinfoOs *ret = NULL;
GList *oss = NULL;
GList *os_iter;
- const gchar *tree_family;
- const gchar *tree_variant;
- const gchar *tree_version;
- const gchar *tree_arch;
+ const gchar *treeinfo_family;
+ const gchar *treeinfo_variant;
+ const gchar *treeinfo_version;
+ const gchar *treeinfo_arch;
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
g_return_val_if_fail(tree != NULL, NULL);
- tree_family = osinfo_tree_get_treeinfo_family(tree);
- tree_variant = osinfo_tree_get_treeinfo_variant(tree);
- tree_version = osinfo_tree_get_treeinfo_version(tree);
- tree_arch = osinfo_tree_get_treeinfo_arch(tree);
+ treeinfo_family = osinfo_tree_get_treeinfo_family(tree);
+ treeinfo_variant = osinfo_tree_get_treeinfo_variant(tree);
+ treeinfo_version = osinfo_tree_get_treeinfo_version(tree);
+ treeinfo_arch = osinfo_tree_get_treeinfo_arch(tree);
oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses));
for (os_iter = oss; os_iter; os_iter = os_iter->next) {
@@ -798,10 +798,10 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
os_version = osinfo_tree_get_treeinfo_version(os_tree);
os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex(os_family, tree_family) &&
- match_regex(os_variant, tree_variant) &&
- match_regex(os_version, tree_version) &&
- match_regex(os_arch, tree_arch)) {
+ if (match_regex(os_family, treeinfo_family) &&
+ match_regex(os_variant, treeinfo_variant) &&
+ match_regex(os_version, treeinfo_version) &&
+ match_regex(os_arch, treeinfo_arch)) {
ret = os;
if (matched_tree != NULL)
*matched_tree = os_tree;
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:24 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:24 +0100
Subject: [Libosinfo] [libosinfo PATCH 2/8] db: Rename os_* to os_treeinfo_*
in guess_os_from_tree()
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-3-fidencio@redhat.com>
It'll make clear that we're dealing with the treeinfo attributes and not
with the tree ones.
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 3795903..136cf79 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -785,23 +785,23 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
- const gchar *os_family;
- const gchar *os_variant;
- const gchar *os_version;
- const gchar *os_arch;
+ const gchar *os_treeinfo_family;
+ const gchar *os_treeinfo_variant;
+ const gchar *os_treeinfo_version;
+ const gchar *os_treeinfo_arch;
if (!osinfo_tree_has_treeinfo(os_tree))
continue;
- os_family = osinfo_tree_get_treeinfo_family(os_tree);
- os_variant = osinfo_tree_get_treeinfo_variant(os_tree);
- os_version = osinfo_tree_get_treeinfo_version(os_tree);
- os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
+ os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
+ os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
+ os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
+ os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex(os_family, treeinfo_family) &&
- match_regex(os_variant, treeinfo_variant) &&
- match_regex(os_version, treeinfo_version) &&
- match_regex(os_arch, treeinfo_arch)) {
+ if (match_regex(os_treeinfo_family, treeinfo_family) &&
+ match_regex(os_treeinfo_variant, treeinfo_variant) &&
+ match_regex(os_treeinfo_version, treeinfo_version) &&
+ match_regex(os_treeinfo_arch, treeinfo_arch)) {
ret = os;
if (matched_tree != NULL)
*matched_tree = os_tree;
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:25 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:25 +0100
Subject: [Libosinfo] [libosinfo PATCH 3/8] db: Consider the tree arch when
guessing an OS from tree
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-4-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 136cf79..b6d9282 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -761,6 +761,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
OsinfoOs *ret = NULL;
GList *oss = NULL;
GList *os_iter;
+ const gchar *tree_arch;
const gchar *treeinfo_family;
const gchar *treeinfo_variant;
const gchar *treeinfo_version;
@@ -769,6 +770,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
g_return_val_if_fail(tree != NULL, NULL);
+ tree_arch = osinfo_tree_get_architecture(tree);
treeinfo_family = osinfo_tree_get_treeinfo_family(tree);
treeinfo_variant = osinfo_tree_get_treeinfo_variant(tree);
treeinfo_version = osinfo_tree_get_treeinfo_version(tree);
@@ -785,6 +787,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
+ const gchar *os_tree_arch;
const gchar *os_treeinfo_family;
const gchar *os_treeinfo_variant;
const gchar *os_treeinfo_version;
@@ -793,12 +796,14 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
if (!osinfo_tree_has_treeinfo(os_tree))
continue;
+ os_tree_arch = osinfo_tree_get_architecture(os_tree);
os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex(os_treeinfo_family, treeinfo_family) &&
+ if (match_regex(os_tree_arch, tree_arch) &&
+ match_regex(os_treeinfo_family, treeinfo_family) &&
match_regex(os_treeinfo_variant, treeinfo_variant) &&
match_regex(os_treeinfo_version, treeinfo_version) &&
match_regex(os_treeinfo_arch, treeinfo_arch)) {
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:26 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:26 +0100
Subject: [Libosinfo] [libosinfo PATCH 4/8] db: Deal with "unknown" tree
architectures
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-5-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index b6d9282..1038142 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -761,6 +761,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
OsinfoOs *ret = NULL;
GList *oss = NULL;
GList *os_iter;
+ GList *unknown_oss = NULL;
const gchar *tree_arch;
const gchar *treeinfo_family;
const gchar *treeinfo_variant;
@@ -797,6 +798,11 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
continue;
os_tree_arch = osinfo_tree_get_architecture(os_tree);
+ if (g_str_equal(os_tree_arch, "unknown")) {
+ unknown_oss = g_list_prepend(unknown_oss, os);
+ continue;
+ }
+
os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
@@ -817,11 +823,49 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
g_list_free(trees);
g_object_unref(tree_list);
+ if (ret)
+ goto end;
+ }
+
+ for (os_iter = unknown_oss; os_iter; os_iter = os_iter->next) {
+ OsinfoOs *os = OSINFO_OS(os_iter->data);
+ OsinfoTreeList *tree_list = osinfo_os_get_tree_list(os);
+ GList *trees = osinfo_list_get_elements(OSINFO_LIST(tree_list));
+ GList *tree_iter;
+
+ for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
+ OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
+ const gchar *os_treeinfo_family;
+ const gchar *os_treeinfo_variant;
+ const gchar *os_treeinfo_version;
+ const gchar *os_treeinfo_arch;
+
+ os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
+ os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
+ os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
+ os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
+
+ if (match_regex(os_treeinfo_family, treeinfo_family) &&
+ match_regex(os_treeinfo_variant, treeinfo_variant) &&
+ match_regex(os_treeinfo_version, treeinfo_version) &&
+ match_regex(os_treeinfo_arch, treeinfo_arch)) {
+ ret = os;
+ if (matched_tree != NULL)
+ *matched_tree = os_tree;
+ break;
+ }
+ }
+
+ g_list_free(trees);
+ g_object_unref(tree_list);
+
if (ret)
break;
}
+ end:
g_list_free(oss);
+ g_list_free(unknown_oss);
return ret;
}
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:27 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:27 +0100
Subject: [Libosinfo] [libosinfo PATCH 5/8] test-db: Add test for guessing
tree from OS
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-6-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
tests/test-db.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/tests/test-db.c b/tests/test-db.c
index a0fa490..ac7f9c8 100644
--- a/tests/test-db.c
+++ b/tests/test-db.c
@@ -450,6 +450,57 @@ test_identify_media(void)
}
+static OsinfoTree *
+create_tree(const gchar *arch)
+{
+ OsinfoTree *tree;
+
+ tree = osinfo_tree_new("foo", arch);
+ osinfo_entity_set_param(OSINFO_ENTITY(tree),
+ OSINFO_TREE_PROP_TREEINFO_FAMILY,
+ "Tree");
+ osinfo_entity_set_param(OSINFO_ENTITY(tree),
+ OSINFO_TREE_PROP_TREEINFO_VERSION,
+ "unknown");
+ return tree;
+}
+
+
+static void
+test_guess_os_from_tree(void)
+{
+ OsinfoLoader *loader = osinfo_loader_new();
+ OsinfoDb *db;
+ OsinfoTree *tree;
+ OsinfoTree *matched_tree = NULL;
+ OsinfoOs *os;
+
+ GError *error = NULL;
+
+ osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error);
+ g_assert_no_error(error);
+ db = osinfo_loader_get_db(loader);
+
+ /* Matching against an "unknown" architecture" */
+ tree = create_tree("x86_64");
+ os = osinfo_db_guess_os_from_tree(db, tree, &matched_tree);
+ g_assert_nonnull(os);
+ g_assert_nonnull(matched_tree);
+ g_assert_cmpstr(osinfo_tree_get_architecture(matched_tree), == , "unknown");
+ g_object_unref(tree);
+ matched_tree = NULL;
+
+ /* Matching against a known architecture, which has to have precendence */
+ tree = create_tree("i686");
+ os = osinfo_db_guess_os_from_tree(db, tree, &matched_tree);
+ g_assert_nonnull(os);
+ g_assert_nonnull(matched_tree);
+ g_assert_cmpstr(osinfo_tree_get_architecture(matched_tree), == , "i686");
+
+ g_object_unref(tree);
+ g_object_unref(loader);
+}
+
int
main(int argc, char *argv[])
@@ -465,6 +516,7 @@ main(int argc, char *argv[])
g_test_add_func("/db/prop_os", test_prop_os);
g_test_add_func("/db/rel_os", test_rel_os);
g_test_add_func("/db/identify_media", test_identify_media);
+ g_test_add_func("/db/guess_os_from_tree", test_guess_os_from_tree);
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
@@ -480,6 +532,7 @@ main(int argc, char *argv[])
osinfo_loader_get_type();
osinfo_install_script_get_type();
osinfo_install_scriptlist_get_type();
+ osinfo_tree_get_type();
return g_test_run();
}
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:28 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:28 +0100
Subject: [Libosinfo] [libosinfo PATCH 6/8] db: Consider the media arch when
guess an OS from media
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-7-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 1038142..2cecaf6 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -545,6 +545,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
OsinfoOs *ret = NULL;
GList *oss = NULL;
GList *os_iter;
+ const gchar *media_arch;
const gchar *media_volume;
const gchar *media_system;
const gchar *media_publisher;
@@ -554,6 +555,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
g_return_val_if_fail(media != NULL, NULL);
+ media_arch = osinfo_media_get_architecture(media);
media_volume = osinfo_media_get_volume_id(media);
media_system = osinfo_media_get_system_id(media);
media_publisher = osinfo_media_get_publisher_id(media);
@@ -571,6 +573,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
for (media_iter = medias; media_iter; media_iter = media_iter->next) {
OsinfoMedia *os_media = OSINFO_MEDIA(media_iter->data);
+ const gchar *os_arch = osinfo_media_get_architecture(os_media);
const gchar *os_volume = osinfo_media_get_volume_id(os_media);
const gchar *os_system = osinfo_media_get_system_id(os_media);
const gchar *os_publisher = osinfo_media_get_publisher_id(os_media);
@@ -587,7 +590,8 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
if (os_vol_size <= 0)
os_vol_size = media_vol_size;
- if (match_regex(os_volume, media_volume) &&
+ if (match_regex(os_arch, media_arch) &&
+ match_regex(os_volume, media_volume) &&
match_regex(os_application, media_application) &&
match_regex(os_system, media_system) &&
match_regex(os_publisher, media_publisher) &&
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:29 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:29 +0100
Subject: [Libosinfo] [libosinfo PATCH 7/8] db: Deal with "unknown" media
architecture
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-8-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 2cecaf6..6885a3f 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -544,6 +544,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
{
OsinfoOs *ret = NULL;
GList *oss = NULL;
+ GList *unknown_oss = NULL;
GList *os_iter;
const gchar *media_arch;
const gchar *media_volume;
@@ -587,6 +588,11 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
os_vol_size <= 0)
continue;
+ if (g_str_equal(os_arch, "unknown")) {
+ unknown_oss = g_list_prepend(unknown_oss, os);
+ continue;
+ }
+
if (os_vol_size <= 0)
os_vol_size = media_vol_size;
@@ -606,11 +612,51 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
g_list_free(medias);
g_object_unref(media_list);
+ if (ret)
+ goto end;
+ }
+
+ for (os_iter = unknown_oss; os_iter; os_iter = os_iter->next) {
+ OsinfoOs *os = OSINFO_OS(os_iter->data);
+ OsinfoMediaList *media_list = osinfo_os_get_media_list(os);
+ GList *medias = osinfo_list_get_elements(OSINFO_LIST(media_list));
+ GList *media_iter;
+
+ medias = g_list_sort(medias, media_volume_compare);
+
+ for (media_iter = medias; media_iter; media_iter = media_iter->next) {
+ OsinfoMedia *os_media = OSINFO_MEDIA(media_iter->data);
+ const gchar *os_volume = osinfo_media_get_volume_id(os_media);
+ const gchar *os_system = osinfo_media_get_system_id(os_media);
+ const gchar *os_publisher = osinfo_media_get_publisher_id(os_media);
+ const gchar *os_application = osinfo_media_get_application_id(os_media);
+ gint64 os_vol_size = osinfo_media_get_volume_size(os_media);
+
+ if (os_vol_size <= 0)
+ os_vol_size = media_vol_size;
+
+ if (match_regex(os_volume, media_volume) &&
+ match_regex(os_application, media_application) &&
+ match_regex(os_system, media_system) &&
+ match_regex(os_publisher, media_publisher) &&
+ os_vol_size == media_vol_size) {
+ ret = os;
+ if (matched_media != NULL)
+ *matched_media = os_media;
+ break;
+ }
+ }
+
+ g_list_free(medias);
+ g_object_unref(media_list);
+
if (ret)
break;
}
+ end:
g_list_free(oss);
+ g_list_free(unknown_oss);
return ret;
}
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:24:30 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:24:30 +0100
Subject: [Libosinfo] [libosinfo PATCH 8/8] test-db: Add test to cover
identifying a media with "unknown" arch
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <20190327112430.10360-9-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
.../dbdata/os/libosinfo.org/test-db-media.xml | 14 +++++++++++
tests/test-db.c | 25 +++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/tests/dbdata/os/libosinfo.org/test-db-media.xml b/tests/dbdata/os/libosinfo.org/test-db-media.xml
index 04badfd..3a7f2cc 100644
--- a/tests/dbdata/os/libosinfo.org/test-db-media.xml
+++ b/tests/dbdata/os/libosinfo.org/test-db-media.xml
@@ -25,6 +25,20 @@
+
+
+ bootimg
+ LINUX
+
+
+
+
+
+ bootimg
+ LINUX
+
+
+
diff --git a/tests/test-db.c b/tests/test-db.c
index ac7f9c8..05aa2ae 100644
--- a/tests/test-db.c
+++ b/tests/test-db.c
@@ -446,6 +446,30 @@ test_identify_media(void)
g_assert_false(osinfo_db_identify_media(db, media));
g_object_unref(media);
+ /* Matching against an "unknown" architecture */
+ media = osinfo_media_new("foo", "x86_64");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_VOLUME_ID,
+ "bootimg");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_SYSTEM_ID,
+ "LINUX");
+ g_assert_true(osinfo_db_identify_media(db, media));
+ g_assert_cmpstr(osinfo_media_get_architecture(media), ==, "unknown");
+ g_object_unref(media);
+
+ /* Matching against a known architecture, which has to have precendence */
+ media = osinfo_media_new("foo", "i686");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_VOLUME_ID,
+ "bootimg");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_SYSTEM_ID,
+ "LINUX");
+ g_assert_true(osinfo_db_identify_media(db, media));
+ g_assert_cmpstr(osinfo_media_get_architecture(media), ==, "i686");
+ g_object_unref(media);
+
g_object_unref(loader);
}
@@ -533,6 +557,7 @@ main(int argc, char *argv[])
osinfo_install_script_get_type();
osinfo_install_scriptlist_get_type();
osinfo_tree_get_type();
+ osinfo_media_get_type();
return g_test_run();
}
--
2.20.1
From fidencio at redhat.com Wed Mar 27 11:28:27 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:28:27 +0100
Subject: [Libosinfo] [libosinfo PATCH 5/8] test-db: Add test for
guessing tree from OS
In-Reply-To: <20190327112430.10360-6-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
<20190327112430.10360-6-fidencio@redhat.com>
Message-ID:
On Wed, Mar 27, 2019 at 12:24 PM Fabiano Fid?ncio wrote:
>
> https://gitlab.com/libosinfo/libosinfo/issues/20
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> tests/test-db.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
>
> diff --git a/tests/test-db.c b/tests/test-db.c
> index a0fa490..ac7f9c8 100644
> --- a/tests/test-db.c
> +++ b/tests/test-db.c
> @@ -450,6 +450,57 @@ test_identify_media(void)
> }
>
>
> +static OsinfoTree *
> +create_tree(const gchar *arch)
> +{
> + OsinfoTree *tree;
> +
> + tree = osinfo_tree_new("foo", arch);
> + osinfo_entity_set_param(OSINFO_ENTITY(tree),
> + OSINFO_TREE_PROP_TREEINFO_FAMILY,
> + "Tree");
> + osinfo_entity_set_param(OSINFO_ENTITY(tree),
> + OSINFO_TREE_PROP_TREEINFO_VERSION,
> + "unknown");
> + return tree;
> +}
> +
> +
> +static void
> +test_guess_os_from_tree(void)
> +{
> + OsinfoLoader *loader = osinfo_loader_new();
> + OsinfoDb *db;
> + OsinfoTree *tree;
> + OsinfoTree *matched_tree = NULL;
> + OsinfoOs *os;
> +
> + GError *error = NULL;
> +
> + osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error);
> + g_assert_no_error(error);
> + db = osinfo_loader_get_db(loader);
> +
> + /* Matching against an "unknown" architecture" */
> + tree = create_tree("x86_64");
> + os = osinfo_db_guess_os_from_tree(db, tree, &matched_tree);
> + g_assert_nonnull(os);
> + g_assert_nonnull(matched_tree);
> + g_assert_cmpstr(osinfo_tree_get_architecture(matched_tree), == , "unknown");
`make syntax-check` told me about an extra space after "=="
> + g_object_unref(tree);
> + matched_tree = NULL;
> +
> + /* Matching against a known architecture, which has to have precendence */
> + tree = create_tree("i686");
> + os = osinfo_db_guess_os_from_tree(db, tree, &matched_tree);
> + g_assert_nonnull(os);
> + g_assert_nonnull(matched_tree);
> + g_assert_cmpstr(osinfo_tree_get_architecture(matched_tree), == , "i686");
`make syntax-check` told me about an extra space after "=="
> +
> + g_object_unref(tree);
> + g_object_unref(loader);
> +}
> +
>
> int
> main(int argc, char *argv[])
> @@ -465,6 +516,7 @@ main(int argc, char *argv[])
> g_test_add_func("/db/prop_os", test_prop_os);
> g_test_add_func("/db/rel_os", test_rel_os);
> g_test_add_func("/db/identify_media", test_identify_media);
> + g_test_add_func("/db/guess_os_from_tree", test_guess_os_from_tree);
>
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> @@ -480,6 +532,7 @@ main(int argc, char *argv[])
> osinfo_loader_get_type();
> osinfo_install_script_get_type();
> osinfo_install_scriptlist_get_type();
> + osinfo_tree_get_type();
>
> return g_test_run();
> }
> --
> 2.20.1
>
From fidencio at redhat.com Wed Mar 27 11:38:19 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 12:38:19 +0100
Subject: [Libosinfo] [libosinfo PATCH 0/8] Use "unknown" arch as a
fallback for media/tree detection
In-Reply-To: <20190327112430.10360-1-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID:
On Wed, Mar 27, 2019 at 12:24 PM Fabiano Fid?ncio wrote:
>
> This series has been written considering:
> - https://www.redhat.com/archives/libosinfo/2019-February/msg00247.html
> - a similar patch will be done for medias
Well, Cole's patches just adds "unknown" to the architectures, so no
similar patch is needed for medias :-)
I'm wondering here whether "all" could be used for the same purpose as
there's no such thing as a media or tree of all architectures.
Anyways, Daniel, is "unknown" fine? Would you prefer going for
"fallback" instead? Or just abuse the meaning of "all"?
[snip]
From berrange at redhat.com Wed Mar 27 11:42:29 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 27 Mar 2019 11:42:29 +0000
Subject: [Libosinfo] [libosinfo PATCH 4/8] db: Deal with "unknown" tree
architectures
In-Reply-To: <20190327112430.10360-5-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
<20190327112430.10360-5-fidencio@redhat.com>
Message-ID: <20190327114229.GQ23844@redhat.com>
On Wed, Mar 27, 2019 at 12:24:26PM +0100, Fabiano Fid?ncio wrote:
> https://gitlab.com/libosinfo/libosinfo/issues/20
Commit messages should be self-contained, fully describing why that are
doing what they're doing & why.
It is fine to include a bug URL, but the commit message should
expect that the URL becomes a 404 in the future.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/osinfo_db.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index b6d9282..1038142 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -761,6 +761,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> OsinfoOs *ret = NULL;
> GList *oss = NULL;
> GList *os_iter;
> + GList *unknown_oss = NULL;
> const gchar *tree_arch;
> const gchar *treeinfo_family;
> const gchar *treeinfo_variant;
> @@ -797,6 +798,11 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> continue;
>
> os_tree_arch = osinfo_tree_get_architecture(os_tree);
> + if (g_str_equal(os_tree_arch, "unknown")) {
> + unknown_oss = g_list_prepend(unknown_oss, os);
> + continue;
> + }
> +
> os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
> os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
> @@ -817,11 +823,49 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> g_list_free(trees);
> g_object_unref(tree_list);
>
> + if (ret)
> + goto end;
> + }
> +
> + for (os_iter = unknown_oss; os_iter; os_iter = os_iter->next) {
> + OsinfoOs *os = OSINFO_OS(os_iter->data);
> + OsinfoTreeList *tree_list = osinfo_os_get_tree_list(os);
> + GList *trees = osinfo_list_get_elements(OSINFO_LIST(tree_list));
> + GList *tree_iter;
> +
> + for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
> + OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
> + const gchar *os_treeinfo_family;
> + const gchar *os_treeinfo_variant;
> + const gchar *os_treeinfo_version;
> + const gchar *os_treeinfo_arch;
> +
> + os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
> + os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> + os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
> + os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
> +
> + if (match_regex(os_treeinfo_family, treeinfo_family) &&
> + match_regex(os_treeinfo_variant, treeinfo_variant) &&
> + match_regex(os_treeinfo_version, treeinfo_version) &&
> + match_regex(os_treeinfo_arch, treeinfo_arch)) {
> + ret = os;
> + if (matched_tree != NULL)
> + *matched_tree = os_tree;
> + break;
> + }
> + }
> +
> + g_list_free(trees);
> + g_object_unref(tree_list);
> +
> if (ret)
> break;
> }
>
> + end:
> g_list_free(oss);
> + g_list_free(unknown_oss);
>
> return ret;
> }
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From fidencio at redhat.com Wed Mar 27 12:01:22 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Wed, 27 Mar 2019 13:01:22 +0100
Subject: [Libosinfo] [libosinfo PATCH 4/8] db: Deal with "unknown" tree
architectures
In-Reply-To: <20190327114229.GQ23844@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
<20190327112430.10360-5-fidencio@redhat.com>
<20190327114229.GQ23844@redhat.com>
Message-ID:
On Wed, Mar 27, 2019 at 12:42 PM Daniel P. Berrang? wrote:
>
> On Wed, Mar 27, 2019 at 12:24:26PM +0100, Fabiano Fid?ncio wrote:
> > https://gitlab.com/libosinfo/libosinfo/issues/20
>
> Commit messages should be self-contained, fully describing why that are
> doing what they're doing & why.
' "unknown" tree architectures (from our database) are used as a
fallback to guess some os from a tree.
Knowing that, any entry containing "unknown" architecture should not
be considered in the first iteration done trying to match the passed
tree with our database entries, thus those are skipped.
The skipped entries are, later on, considered in case no specific
match has been found.'
I'll add the above text to this commit and a similar one to the commit
dealing with medias.
>
> It is fine to include a bug URL, but the commit message should
> expect that the URL becomes a 404 in the future.
>
> >
> > Signed-off-by: Fabiano Fid?ncio
> > ---
> > osinfo/osinfo_db.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 44 insertions(+)
> >
> > diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> > index b6d9282..1038142 100644
> > --- a/osinfo/osinfo_db.c
> > +++ b/osinfo/osinfo_db.c
> > @@ -761,6 +761,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> > OsinfoOs *ret = NULL;
> > GList *oss = NULL;
> > GList *os_iter;
> > + GList *unknown_oss = NULL;
> > const gchar *tree_arch;
> > const gchar *treeinfo_family;
> > const gchar *treeinfo_variant;
> > @@ -797,6 +798,11 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> > continue;
> >
> > os_tree_arch = osinfo_tree_get_architecture(os_tree);
> > + if (g_str_equal(os_tree_arch, "unknown")) {
> > + unknown_oss = g_list_prepend(unknown_oss, os);
> > + continue;
> > + }
> > +
> > os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
> > os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> > os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
> > @@ -817,11 +823,49 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> > g_list_free(trees);
> > g_object_unref(tree_list);
> >
> > + if (ret)
> > + goto end;
> > + }
> > +
> > + for (os_iter = unknown_oss; os_iter; os_iter = os_iter->next) {
> > + OsinfoOs *os = OSINFO_OS(os_iter->data);
> > + OsinfoTreeList *tree_list = osinfo_os_get_tree_list(os);
> > + GList *trees = osinfo_list_get_elements(OSINFO_LIST(tree_list));
> > + GList *tree_iter;
> > +
> > + for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
> > + OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
> > + const gchar *os_treeinfo_family;
> > + const gchar *os_treeinfo_variant;
> > + const gchar *os_treeinfo_version;
> > + const gchar *os_treeinfo_arch;
> > +
> > + os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
> > + os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> > + os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
> > + os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
> > +
> > + if (match_regex(os_treeinfo_family, treeinfo_family) &&
> > + match_regex(os_treeinfo_variant, treeinfo_variant) &&
> > + match_regex(os_treeinfo_version, treeinfo_version) &&
> > + match_regex(os_treeinfo_arch, treeinfo_arch)) {
> > + ret = os;
> > + if (matched_tree != NULL)
> > + *matched_tree = os_tree;
> > + break;
> > + }
> > + }
> > +
> > + g_list_free(trees);
> > + g_object_unref(tree_list);
> > +
> > if (ret)
> > break;
> > }
> >
> > + end:
> > g_list_free(oss);
> > + g_list_free(unknown_oss);
> >
> > return ret;
> > }
> > --
> > 2.20.1
> >
> > _______________________________________________
> > Libosinfo mailing list
> > Libosinfo at redhat.com
> > https://www.redhat.com/mailman/listinfo/libosinfo
>
> Regards,
> Daniel
> --
> |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org -o- https://fstop138.berrange.com :|
> |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From crobinso at redhat.com Thu Mar 28 00:17:33 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 20:17:33 -0400
Subject: [Libosinfo] [libosinfo PATCH] tree: Also check fore "treeinfo"
in addition to ".treeinfo"
In-Reply-To: <20190326120256.25348-1-fidencio@redhat.com>
References: <20190326120256.25348-1-fidencio@redhat.com>
Message-ID:
*for in the title
On 3/26/19 8:02 AM, Fabiano Fid?ncio wrote:
> Akamai CDN hosted files can't start with a dot, making trees published to
> a CDN having their ".treeinfo" files renamed to "treeinfo".
>
> https://gitlab.com/libosinfo/libosinfo/issues/18
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/osinfo_tree.c | 67 +++++++++++++++++++++++++++++++++-----------
> 1 file changed, 50 insertions(+), 17 deletions(-)
>
Fixes my test case, doesn't cause any regressions in my URL test suite,
and code looks sensible to me. Thanks!
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Thu Mar 28 00:48:02 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 20:48:02 -0400
Subject: [Libosinfo] [libosinfo PATCH 1/2] tree: Add get_os_variants()
API
In-Reply-To: <20190326120514.25535-1-fidencio@redhat.com>
References: <20190326120514.25535-1-fidencio@redhat.com>
Message-ID: <39090fd7-f3d1-b22b-54ac-51b7ce1ed5b4@redhat.com>
On 3/26/19 8:05 AM, Fabiano Fid?ncio wrote:
> osinfo-db schema allows that, but libosinfo never really had an API to
> support it.
>
> https://gitlab.com/libosinfo/libosinfo/issues/16
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/osinfo_loader.c | 17 ++++++++-
> osinfo/osinfo_os.c | 2 ++
> osinfo/osinfo_tree.c | 70 +++++++++++++++++++++++++++++++++++-
> osinfo/osinfo_tree.h | 2 ++
> osinfo/osinfo_tree_private.h | 29 +++++++++++++++
> 5 files changed, 118 insertions(+), 2 deletions(-)
> create mode 100644 osinfo/osinfo_tree_private.h
>
I needed this to make get_os_variants appear in python bindings:
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index aa8e6d7..7ef878e 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -572,6 +572,8 @@ LIBOSINFO_1.5.0 {
global:
osinfo_install_config_get_installation_url;
osinfo_install_config_set_installation_url;
+ osinfo_tree_get_os_variants;
} LIBOSINFO_1.4.0;
/* Symbols in next release...
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index dd1cab2..8c1b321 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -916,7 +916,7 @@ void osinfo_tree_set_os(OsinfoTree *tree, OsinfoOs *os)
}
/**
- * osinfo_tree_get_os_variant_list:
+ * osinfo_tree_get_os_variants:
* @tree: an #OsinfoTree instance
*
* Gets the variants of the associated operating system.
That last comment line above need tweaking too. I think libosinfo.syms
also needs get_os and set_os to match, we export those for the media
APIs as well
With those fixed, series:
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Thu Mar 28 01:08:57 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 21:08:57 -0400
Subject: [Libosinfo] [PATCH osinfo-db 0/6] Add scripts/osinfo-db-add-iso.py
Message-ID:
This series adds scripts/osinfo-db-add-iso.py, which simplifies the
process of adding new iso data to the test suite and optionally filling
in a block for the . Call it like:
./scripts/osinfo-db-add-iso.py SHORTID [--arch ARCH] ISOPATH
It will print a block template to stdout, and generate a
correctly named data file in tests/isodata/
Patch #1 renames some dirs in tests/isodata/* to consistently be
named after the value.
Patch #2 adds the script
Remaining patches tweak debian media data detection and add some more
test cases... not strictly related to the first two patches but they
were my test cases to get this working
Cole Robinson (6):
tests: isodata: use predictable file layout
Add scripts/osinfo-db-add-iso.py
debian8: fix 8.10 iso media detection
debian8: add arm64, ppc64el, s390x DVD output
debian9: add ppc64el and s390x data
debian9: Fix arm64 media paths
data/os/debian.org/debian-8.xml.in | 29 ++++-
data/os/debian.org/debian-9.xml.in | 63 ++++++++--
scripts/osinfo-db-add-iso.py | 113 ++++++++++++++++++
.../alt-p8-builder-20180912-i586.iso.txt | 0
.../alt-p8-builder-20180912-x86_64.iso.txt | 0
.../alt-p8-cinnamon-20180912-i586.iso.txt | 0
.../alt-p8-cinnamon-20180912-x86_64.iso.txt | 0
...alt-p8-enlightenment-20180912-i586.iso.txt | 0
...t-p8-enlightenment-20180912-x86_64.iso.txt | 0
.../alt-p8-gnome3-20180912-i586.iso.txt | 0
.../alt-p8-gnome3-20180912-x86_64.iso.txt | 0
.../alt-p8-gnustep-20180912-i586.iso.txt | 0
.../alt-p8-gnustep-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-icewm-20180912-i586.iso.txt | 0
.../alt-p8-icewm-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-jeos-20180912-i586.iso.txt | 0
.../alt-p8-jeos-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-kde4-20180912-i586.iso.txt | 0
.../alt-p8-kde4-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-kde5-20180912-i586.iso.txt | 0
.../alt-p8-kde5-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-lxde-20180912-i586.iso.txt | 0
.../alt-p8-lxde-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-lxqt-20180912-i586.iso.txt | 0
.../alt-p8-lxqt-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-mate-20180913-i586.iso.txt | 0
.../alt-p8-mate-20180913-x86_64.iso.txt | 0
.../alt-p8-rescue-20180912-i586.iso.txt | 0
.../alt-p8-rescue-20180912-x86_64.iso.txt | 0
.../alt-p8-server-20180913-i586.iso.txt | 0
.../alt-p8-server-20180913-x86_64.iso.txt | 0
.../alt-p8-server-pve-20180912-x86_64.iso.txt | 0
.../alt-p8-sysv-tde-20180912-i586.iso.txt | 0
.../alt-p8-sysv-tde-20180912-x86_64.iso.txt | 0
.../alt-p8-sysv-xfce-20180912-i586.iso.txt | 0
.../alt-p8-sysv-xfce-20180912-x86_64.iso.txt | 0
.../alt-p8-wmaker-20180912-i586.iso.txt | 0
.../alt-p8-wmaker-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-xfce-20180912-i586.iso.txt | 0
.../alt-p8-xfce-20180912-x86_64.iso.txt | 0
.../regular-cinnamon-20181017-i586.iso.txt | 0
.../regular-cinnamon-20181017-x86_64.iso.txt | 0
...egular-enlightenment-20181017-i586.iso.txt | 0
...ular-enlightenment-20181017-x86_64.iso.txt | 0
.../regular-gnome3-20181017-i586.iso.txt | 0
.../regular-gnome3-20181017-x86_64.iso.txt | 0
.../regular-gnustep-20181017-i586.iso.txt | 0
.../regular-gnustep-20181017-x86_64.iso.txt | 0
.../regular-icewm-20181017-i586.iso.txt | 0
.../regular-icewm-20181017-x86_64.iso.txt | 0
.../regular-jeos-20181017-i586.iso.txt | 0
.../regular-jeos-20181017-x86_64.iso.txt | 0
.../regular-kde5-20181017-i586.iso.txt | 0
.../regular-kde5-20181017-x86_64.iso.txt | 0
.../regular-lxde-20181017-i586.iso.txt | 0
.../regular-lxde-20181017-x86_64.iso.txt | 0
.../regular-lxqt-20181017-i586.iso.txt | 0
.../regular-lxqt-20181017-x86_64.iso.txt | 0
.../regular-mate-20181017-i586.iso.txt | 0
.../regular-mate-20181017-x86_64.iso.txt | 0
.../regular-rescue-20181017-i586.iso.txt | 0
.../regular-rescue-20181017-x86_64.iso.txt | 0
.../regular-wmaker-20181017-i586.iso.txt | 0
.../regular-wmaker-20181017-x86_64.iso.txt | 0
.../regular-xfce-20181017-i586.iso.txt | 0
.../regular-xfce-20181017-x86_64.iso.txt | 0
.../alt8.0/alt-education-8.0-i586.iso.txt | 0
.../alt8.0/alt-education-8.0-x86_64.iso.txt | 0
.../alt-kworkstation-8.1-install-i586.iso.txt | 0
...lt-kworkstation-8.1-install-x86_64.iso.txt | 0
.../alt-kworkstation-8.1-live-i586.iso.txt | 0
.../alt-kworkstation-8.1-live-x86_64.iso.txt | 0
.../alt8.1/alt-workstation-8.1-i586.iso.txt | 0
.../alt8.1/alt-workstation-8.1-x86_64.iso.txt | 0
.../alt-kworkstation-8.2-install-i586.iso.txt | 0
...lt-kworkstation-8.2-install-x86_64.iso.txt | 0
.../alt-kworkstation-8.2-live-i586.iso.txt | 0
.../alt-kworkstation-8.2-live-x86_64.iso.txt | 0
.../alt8.2/alt-server-8.2-i586.iso.txt | 0
.../alt8.2/alt-server-8.2-x86_64.iso.txt | 0
.../alt8.2/alt-simply-8.2.0-i586.iso.txt | 0
.../alt8.2/alt-simply-8.2.0-live-i586.iso.txt | 0
.../alt-simply-8.2.0-live-x86_64.iso.txt | 0
.../alt8.2/alt-simply-8.2.0-x86_64.iso.txt | 0
.../alt8.2/alt-workstation-8.2-i586.iso.txt | 0
.../alt8.2/alt-workstation-8.2-x86_64.iso.txt | 0
...aS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt | 0
...aS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt | 0
...aS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt | 0
.../debian8/debian-8.10.0-amd64-DVD-1.iso.txt | 29 +++++
.../debian-8.10.0-amd64-kde-CD-1.iso.txt | 29 +++++
.../debian-8.10.0-amd64-netinst.iso.txt | 29 +++++
.../debian8/debian-8.10.0-i386-DVD-3.iso.txt | 16 +++
.../debian8/debian-8.9.0-arm64-DVD-1.iso.txt | 29 +++++
.../debian-8.9.0-ppc64el-DVD-1.iso.txt | 16 +++
.../debian8/debian-8.9.0-s390x-DVD-1.iso.txt | 16 +++
.../debian9/debian-9.3.0-amd64-DVD-1.iso.txt | 29 +++++
.../debian-9.7.0-arm64-netinst.iso.txt | 29 +++++
.../debian9/debian-9.7.0-i386-netinst.iso.txt | 29 +++++
.../debian-9.7.0-ppc64el-DVD-1.iso.txt | 16 +++
.../debian-9.7.0-ppc64el-netinst.iso.txt | 16 +++
.../debian9/debian-9.7.0-s390x-DVD-1.iso.txt | 16 +++
.../debian-9.7.0-s390x-netinst.iso.txt | 16 +++
...E-15-Installer-DVD-aarch64-GM-DVD1.iso.txt | 0
...E-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt | 0
...SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt | 0
...LE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt | 0
...IENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt | 0
...IENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt | 0
...1_updated_apr_2016_x64_dvd_8705540.iso.txt | 0
...7_updated_jul_2016_x86_dvd_9055560.iso.txt | 0
...ows_10_education_n_x64_dvd_6847236.iso.txt | 0
...ndows_10_education_x86_dvd_6848121.iso.txt | 0
...rprise_2015_ltsb_n_x64_dvd_6848316.iso.txt | 0
...terprise_2015_ltsb_x64_dvd_6848446.iso.txt | 0
...ws_10_enterprise_n_x64_dvd_6852541.iso.txt | 0
...dows_10_enterprise_x64_dvd_6851151.iso.txt | 0
...dows_10_enterprise_x86_dvd_6851156.iso.txt | 0
...pdated_sept_2017_x64_dvd_100090817.iso.txt | 0
..._multiple_editions_x64_dvd_6846432.iso.txt | 0
...7_updated_jul_2016_x64_dvd_9053861.iso.txt | 0
..._multiple_editions_x64_dvd_6846434.iso.txt | 0
...7_updated_jul_2016_x86_dvd_9057460.iso.txt | 0
.../win2k/Win2000S-disk.iso.txt | 0
...debug_checked_build_x64_dvd_917521.iso.txt | 0
...hyper-v_server_2012_x64_dvd_915600.iso.txt | 0
...er_2012_essentials_x64_dvd_1022281.iso.txt | 0
...debug_checked_build_x64_dvd_917505.iso.txt | 0
...rver_and_foundation_x64_dvd_915793.iso.txt | 0
...dows_server_2012_vl_x64_dvd_917758.iso.txt | 0
...windows_server_2012_x64_dvd_915478.iso.txt | 0
...2_r2_debug_checked_x64_dvd_2708216.iso.txt | 0
...r-v_server_2012_r2_x64_dvd_2708236.iso.txt | 0
...2_r2_debug_checked_x64_dvd_2707937.iso.txt | 0
...ials_debug_checked_x64_dvd_2707170.iso.txt | 0
...ntials_with_update_x64_dvd_6052824.iso.txt | 0
...2012_r2_essentials_x64_dvd_2707177.iso.txt | 0
..._r2_vl_with_update_x64_dvd_6052766.iso.txt | 0
..._server_2012_r2_vl_x64_dvd_3319595.iso.txt | 0
...012_r2_with_update_x64_dvd_4065220.iso.txt | 0
...012_r2_with_update_x64_dvd_6052708.iso.txt | 0
...ows_server_2012_r2_x64_dvd_2707946.iso.txt | 0
...2012_r2_foundation_x64_dvd_2708426.iso.txt | 0
...dation_with_update_x64_dvd_6052810.iso.txt | 0
...H_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt | 0
...indows_server_2016_x64_dvd_9718492.iso.txt | 0
...windows_server_2003_enterprise_x64.iso.txt | 0
...en_windows_server_2003_sp2_ia64_cd.iso.txt | 0
.../en_windows_server_2003_sp2_x64_cd.iso.txt | 0
.../en_windows_server_2003_sp2_x86_cd.iso.txt | 0
.../en_windows_server_2003_standard.iso.txt | 0
...n_windows_server_2003_standard_x64.iso.txt | 0
...ws_server_2003_with_sp1_enterprise.iso.txt | 0
...dows_server_2003_with_sp1_standard.iso.txt | 0
.../en_win_srv_2003_r2_enterprise_cd1.iso.txt | 0
.../en_win_srv_2003_r2_enterprise_cd2.iso.txt | 0
..._enterprise_with_sp2_cd1_X13-05460.iso.txt | 0
..._enterprise_with_sp2_cd2_X13-68584.iso.txt | 0
...win_srv_2003_r2_enterprise_x64_cd1.iso.txt | 0
...win_srv_2003_r2_enterprise_x64_cd2.iso.txt | 0
...erprise_x64_with_sp2_cd1_X13-06188.iso.txt | 0
...erprise_x64_with_sp2_cd2_X13-68588.iso.txt | 0
.../en_win_srv_2003_r2_standard_cd1.iso.txt | 0
.../en_win_srv_2003_r2_standard_cd2.iso.txt | 0
...r2_standard_with_sp2_cd1_x13-04790.iso.txt | 0
...r2_standard_with_sp2_cd2_x13-68583.iso.txt | 0
...n_win_srv_2003_r2_standard_x64_cd1.iso.txt | 0
...n_win_srv_2003_r2_standard_x64_cd2.iso.txt | 0
...tandard_x64_with_sp2_cd1_x13-05757.iso.txt | 0
...tandard_x64_with_sp2_cd2_x13-68587.iso.txt | 0
...d_sp2_checked_build_x64_dvd_342435.iso.txt | 0
...rprise_standard_sp2_x64_dvd_342336.iso.txt | 0
...rprise_standard_sp2_x86_dvd_342333.iso.txt | 0
...erprise_standard_x64_dvd_X14-26714.iso.txt | 0
...erprise_standard_x86_dvd_X14-26710.iso.txt | 0
...erver_2008_with_sp2_x64_dvd_342336.iso.txt | 0
...erver_2008_with_sp2_x86_dvd_342333.iso.txt | 0
..._web_server_2008_x64_dvd_X14-26683.iso.txt | 0
..._web_server_2008_x86_dvd_X14-26678.iso.txt | 0
...st_ent_dc_web_retail_x64_X15-50363.img.txt | 0
...with_service_pack_1_x64_dvd_700562.iso.txt | 0
..._server_2008_r2_hpc_x64_dvd_552761.iso.txt | 0
...er_and_web_with_sp1_x64_dvd_617601.iso.txt | 0
...tacenter_and_web_x64_dvd_x15-59754.iso.txt | 0
...web_retail_build_x64_dvd_x15-50365.iso.txt | 0
...nium_based_systems_ia64_dvd_617558.iso.txt | 0
...er_2008_r2_with_sp1_x64_dvd_617601.iso.txt | 0
...s_server_2008_r2_x64_dvd_x15-50365.iso.txt | 0
...st_ent_dc_web_retail_x64_X15-50365.img.txt | 0
.../{windows => win}/win7/Win7ProX86.iso.txt | 0
...essional_with_sp1_x64_dvd_u_676956.iso.lng | 0
...essional_with_sp1_x64_dvd_u_676956.iso.txt | 0
...essional_with_sp1_x86_dvd_u_677077.iso.lng | 0
...essional_with_sp1_x86_dvd_u_677077.iso.txt | 0
...debug_checked_build_dvd_x64_398741.iso.txt | 0
...debug_checked_build_dvd_x86_398742.iso.txt | 0
...rprise_n_with_sp1_x64_dvd_u_677704.iso.lng | 0
...rprise_n_with_sp1_x64_dvd_u_677704.iso.txt | 0
...rprise_n_with_sp1_x86_dvd_u_677703.iso.txt | 0
...s_7_enterprise_n_x64_dvd_x16-11943.iso.lng | 0
...s_7_enterprise_n_x64_dvd_x16-11943.iso.txt | 0
...s_7_enterprise_n_x86_dvd_x16-11935.iso.lng | 0
...s_7_enterprise_n_x86_dvd_x16-11935.iso.txt | 0
...terprise_with_sp1_x64_dvd_u_677651.iso.txt | 0
...terprise_with_sp1_x86_dvd_u_677710.iso.txt | 0
...ows_7_enterprise_x64_dvd_x15-70749.iso.lng | 0
...ows_7_enterprise_x64_dvd_x15-70749.iso.txt | 0
...ows_7_enterprise_x86_dvd_x15-70745.iso.lng | 0
...ows_7_enterprise_x86_dvd_x15-70745.iso.txt | 0
...me_basic_with_sp1_x86_dvd_u_676470.iso.txt | 0
...ows_7_home_basic_x86_dvd_x15-65654.iso.txt | 0
...remium_n_with_sp1_x64_dvd_u_676825.iso.txt | 0
...remium_n_with_sp1_x86_dvd_u_676913.iso.txt | 0
...7_home_premium_n_x64_dvd_x16-13459.iso.txt | 0
...7_home_premium_n_x86_dvd_x16-13457.iso.txt | 0
..._premium_with_sp1_x64_dvd_u_676549.iso.txt | 0
..._premium_with_sp1_x86_dvd_u_676701.iso.txt | 0
...s_7_home_premium_x64_dvd_x15-65733.iso.txt | 0
...s_7_home_premium_x86_dvd_x15-65732.iso.txt | 0
...sional_n_with_sp1_x64_dvd_u_677207.iso.txt | 0
...sional_n_with_sp1_x86_dvd_u_677328.iso.lng | 0
...sional_n_with_sp1_x86_dvd_u_677328.iso.txt | 0
...7_professional_n_x64_dvd_x16-13550.iso.txt | 0
...7_professional_n_x86_dvd_x16-13548.iso.txt | 0
...ssional_vl_build_x64_dvd_x15-71037.iso.txt | 0
...ssional_vl_build_x86_dvd_x15-71033.iso.txt | 0
...with_sp1_vl_build_x64_dvd_u_677791.iso.txt | 0
...with_sp1_vl_build_x86_dvd_u_677896.iso.txt | 0
...essional_with_sp1_x64_dvd_u_676939.iso.lng | 0
...essional_with_sp1_x64_dvd_u_676939.iso.txt | 0
...essional_with_sp1_x86_dvd_u_677056.iso.lng | 0
...essional_with_sp1_x86_dvd_u_677056.iso.txt | 0
...s_7_professional_x86_dvd_x15-65804.iso.txt | 0
...tarter_n_with_sp1_x86_dvd_u_678339.iso.txt | 0
...dows_7_starter_n_x86_dvd_x16-15928.iso.txt | 0
..._starter_with_sp1_x86_dvd_u_678562.iso.txt | 0
...indows_7_starter_x86_dvd_x15-68956.iso.txt | 0
...timate_n_with_sp1_x64_dvd_u_677543.iso.txt | 0
...timate_n_with_sp1_x86_dvd_u_677597.iso.lng | 0
...timate_n_with_sp1_x86_dvd_u_677597.iso.txt | 0
...ows_7_ultimate_n_x64_dvd_x16-13641.iso.txt | 0
...ows_7_ultimate_n_x86_dvd_x16-13640.iso.txt | 0
...ultimate_with_sp1_x64_dvd_u_677332.iso.txt | 0
...ultimate_with_sp1_x86_dvd_u_677460.iso.txt | 0
...windows_7_ultimate_x64_dvd_unknown.iso.txt | 0
.../en_windows_7_ultimate_x64_dvd_unknown.lng | 0
...ndows_7_ultimate_x64_dvd_x15-65922.iso.lng | 0
...ndows_7_ultimate_x64_dvd_x15-65922.iso.txt | 0
...windows_7_ultimate_x86_dvd_unknown.iso.txt | 0
.../en_windows_7_ultimate_x86_dvd_unknown.lng | 0
...ndows_7_ultimate_x86_dvd_x15-65921.iso.lng | 0
...ndows_7_ultimate_x86_dvd_x15-65921.iso.txt | 0
...debug_checked_build_x64_dvd_619601.iso.txt | 0
...debug_checked_build_x86_dvd_619602.iso.txt | 0
...with_sp1_vl_build_x64_dvd_u_677808.iso.lng | 0
...with_sp1_vl_build_x64_dvd_u_677808.iso.txt | 0
...with_sp1_vl_build_x86_dvd_u_677759.iso.lng | 0
...with_sp1_vl_build_x86_dvd_u_677759.iso.txt | 0
...remium_n_with_sp1_x64_dvd_u_676833.iso.lng | 0
...remium_n_with_sp1_x64_dvd_u_676833.iso.txt | 0
...terprise_with_sp1_x64_dvd_u_677671.iso.lng | 0
...terprise_with_sp1_x64_dvd_u_677671.iso.txt | 0
...ultimate_with_sp1_x86_dvd_u_677463.iso.lng | 0
...ultimate_with_sp1_x86_dvd_u_677463.iso.txt | 0
...rprise_with_update_x86_dvd_4050369.iso.txt | 0
...s_8_1_enterprise_n_x64_dvd_2971847.iso.txt | 0
...s_8_1_enterprise_n_x86_dvd_2971852.iso.txt | 0
...ows_8_1_enterprise_x64_dvd_2971910.iso.txt | 0
...ows_8_1_enterprise_x86_dvd_2972291.iso.txt | 0
...n-gb_windows_8_1_n_x64_dvd_2707898.iso.txt | 0
...n-gb_windows_8_1_n_x86_dvd_2707897.iso.txt | 0
...ndows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt | 0
...ndows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt | 0
...windows_8_1_pro_vl_x64_dvd_2971955.iso.txt | 0
...windows_8_1_pro_vl_x86_dvd_2972634.iso.txt | 0
.../en-gb_windows_8_1_x64_dvd_2707421.iso.txt | 0
.../en-gb_windows_8_1_x86_dvd_2707543.iso.txt | 0
...rise_n_with_update_x64_dvd_4065163.iso.txt | 0
...rise_n_with_update_x64_dvd_6050225.iso.txt | 0
...rprise_with_update_x64_dvd_6054382.iso.txt | 0
..._8.1_n_with_update_x64_dvd_6051677.iso.txt | 0
..._8.1_n_with_update_x86_dvd_6051704.iso.txt | 0
...o_n_vl_with_update_x64_dvd_6050969.iso.txt | 0
...o_n_vl_with_update_x86_dvd_6051127.iso.txt | 0
...pro_vl_with_update_x64_dvd_6050880.iso.txt | 0
...pro_vl_with_update_x86_dvd_6050918.iso.txt | 0
...ws_8.1_with_update_x64_dvd_6051480.iso.txt | 0
..._8_1_debug_checked_x64_dvd_2707208.iso.txt | 0
..._8_1_debug_checked_x86_dvd_2707387.iso.txt | 0
...rise_debug_checked_x64_dvd_2756358.iso.txt | 0
...rise_debug_checked_x86_dvd_2756359.iso.txt | 0
...se_n_debug_checked_x64_dvd_2942525.iso.txt | 0
...se_n_debug_checked_x86_dvd_2942527.iso.txt | 0
...s_8_1_enterprise_n_x64_dvd_2791038.iso.txt | 0
...s_8_1_enterprise_n_x64_dvd_2971845.iso.txt | 0
...s_8_1_enterprise_n_x86_dvd_2791297.iso.txt | 0
...s_8_1_enterprise_n_x86_dvd_2971850.iso.txt | 0
...ows_8_1_enterprise_x64_dvd_2791088.iso.txt | 0
...ows_8_1_enterprise_x64_dvd_2971902.iso.txt | 0
...ows_8_1_enterprise_x86_dvd_2791510.iso.txt | 0
...ows_8_1_enterprise_x86_dvd_2972289.iso.txt | 0
..._1_n_debug_checked_x64_dvd_2707894.iso.txt | 0
..._1_n_debug_checked_x86_dvd_2707893.iso.txt | 0
..._8_1_n_with_update_x64_dvd_4065114.iso.txt | 0
.../en_windows_8_1_n_x64_dvd_2707896.iso.txt | 0
.../en_windows_8_1_n_x86_dvd_2707895.iso.txt | 0
...ndows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt | 0
...ndows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt | 0
...ndows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt | 0
...ndows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt | 0
...windows_8_1_pro_vl_x64_dvd_2791292.iso.txt | 0
...windows_8_1_pro_vl_x64_dvd_2971948.iso.txt | 0
...windows_8_1_pro_vl_x86_dvd_2791634.iso.txt | 0
...windows_8_1_pro_vl_x86_dvd_2972633.iso.txt | 0
.../en_windows_8_1_x64_dvd_2707217.iso.txt | 0
.../en_windows_8_1_x86_dvd_2707392.iso.txt | 0
...ows8-ConsumerPreview-32bit-English.iso.lng | 0
...ows8-ConsumerPreview-32bit-English.iso.txt | 0
...ows8-ConsumerPreview-64bit-English.iso.lng | 0
...ows8-ConsumerPreview-64bit-English.iso.txt | 0
...dows_8_enterprise_n_x64_dvd_917975.iso.lng | 0
...dows_8_enterprise_n_x64_dvd_917975.iso.txt | 0
...dows_8_enterprise_n_x64_dvd_918053.iso.txt | 0
...dows_8_enterprise_n_x86_dvd_918708.iso.txt | 0
...indows_8_enterprise_x64_dvd_922086.iso.txt | 0
...indows_8_enterprise_x86_dvd_917588.iso.txt | 0
.../en-gb_windows_8_n_x64_dvd_915799.iso.txt | 0
.../en-gb_windows_8_n_x86_dvd_916086.iso.txt | 0
..._windows_8_pro_n_vl_x64_dvd_918679.iso.txt | 0
..._windows_8_pro_n_vl_x86_dvd_918878.iso.txt | 0
...gb_windows_8_pro_vl_x64_dvd_917700.iso.txt | 0
...gb_windows_8_pro_vl_x86_dvd_917831.iso.txt | 0
.../en-gb_windows_8_x64_dvd_915412.iso.txt | 0
.../en-gb_windows_8_x86_dvd_915479.iso.lng | 0
.../en-gb_windows_8_x86_dvd_915479.iso.txt | 0
...debug_checked_build_x64_dvd_917558.iso.lng | 0
...debug_checked_build_x64_dvd_917558.iso.txt | 0
...debug_checked_build_x86_dvd_917560.iso.lng | 0
...debug_checked_build_x86_dvd_917560.iso.txt | 0
...debug_checked_build_x64_dvd_917527.iso.lng | 0
...debug_checked_build_x64_dvd_917527.iso.txt | 0
...debug_checked_build_x86_dvd_917529.iso.lng | 0
...debug_checked_build_x86_dvd_917529.iso.txt | 0
...debug_checked_build_x64_dvd_917531.iso.lng | 0
...debug_checked_build_x64_dvd_917531.iso.txt | 0
...debug_checked_build_x86_dvd_917534.iso.lng | 0
...debug_checked_build_x86_dvd_917534.iso.txt | 0
...dows_8_enterprise_n_x64_dvd_918052.iso.lng | 0
...dows_8_enterprise_n_x64_dvd_918052.iso.txt | 0
...dows_8_enterprise_n_x86_dvd_918707.iso.lng | 0
...dows_8_enterprise_n_x86_dvd_918707.iso.txt | 0
...indows_8_enterprise_x64_dvd_917522.iso.lng | 0
...indows_8_enterprise_x64_dvd_917522.iso.txt | 0
...indows_8_enterprise_x86_dvd_917587.iso.lng | 0
...indows_8_enterprise_x86_dvd_917587.iso.txt | 0
...debug_checked_build_x64_dvd_917562.iso.lng | 0
...debug_checked_build_x64_dvd_917562.iso.txt | 0
...debug_checked_build_x86_dvd_917564.iso.lng | 0
...debug_checked_build_x86_dvd_917564.iso.txt | 0
.../en_windows_8_n_x64_dvd_916091.iso.lng | 0
.../en_windows_8_n_x64_dvd_916091.iso.txt | 0
.../en_windows_8_n_x86_dvd_916097.iso.lng | 0
.../en_windows_8_n_x86_dvd_916097.iso.txt | 0
..._windows_8_pro_n_vl_x64_dvd_918677.iso.lng | 0
..._windows_8_pro_n_vl_x64_dvd_918677.iso.txt | 0
..._windows_8_pro_n_vl_x86_dvd_918877.iso.lng | 0
..._windows_8_pro_n_vl_x86_dvd_918877.iso.txt | 0
...en_windows_8_pro_vl_x64_dvd_917699.iso.lng | 0
...en_windows_8_pro_vl_x64_dvd_917699.iso.txt | 0
...en_windows_8_pro_vl_x86_dvd_917830.iso.lng | 0
...en_windows_8_pro_vl_x86_dvd_917830.iso.txt | 0
.../win8/en_windows_8_x64_dvd_915440.iso.lng | 0
.../win8/en_windows_8_x64_dvd_915440.iso.txt | 0
.../win8/en_windows_8_x86_dvd_915417.iso.lng | 0
.../win8/en_windows_8_x86_dvd_915417.iso.txt | 0
.../win8/fr_windows_8_x86_dvd_915420.iso.lng | 0
.../win8/fr_windows_8_x86_dvd_915420.iso.txt | 0
..._vista_business_sp2_x64_dvd_342327.iso.txt | 0
..._vista_business_sp2_x86_dvd_342321.iso.txt | 0
...h_service_pack_1_x64_dvd_x14-56048.iso.txt | 0
...h_service_pack_1_x86_dvd_x14-56028.iso.txt | 0
...ista_enterprise_sp2_x64_dvd_342332.iso.txt | 0
...ista_enterprise_sp2_x86_dvd_342329.iso.txt | 0
...ith_service_pack_1_x64_dvd_unknown.iso.txt | 0
...h_service_pack_1_x64_dvd_x14-55934.iso.txt | 0
...ith_service_pack_1_x86_dvd_unknown.iso.txt | 0
...h_service_pack_1_x86_dvd_x14-55954.iso.txt | 0
...ith_service_pack_2_beta_x86_288250.iso.txt | 0
...nterprise_with_sp2_beta_x64_288254.iso.txt | 0
...en_windows_vista_x64_dvd_X12-40712.iso.txt | 0
...en_windows_vista_x64_dvd_x12-40712.iso.txt | 0
...en_windows_vista_x86_dvd_X12-34293.iso.txt | 0
...en_windows_vista_x86_dvd_x12-34293.iso.txt | 0
...th_service_pack_3_x86_cd_x14-80416.iso.txt | 0
.../winxp/cz_winxp_pro_with_sp2.iso.txt | 0
.../en_winXP_Pro_x86_build2600_ISO.img.txt | 0
.../winxp/en_win_xp_pro_n.iso.txt | 0
...th_service_pack_3_x86_cd_x14-92445.iso.txt | 0
...service_pack_3_x86_cd_vl_x14-73974.iso.txt | 0
...th_service_pack_3_x86_cd_x14-80428.iso.txt | 0
.../en_windows_xp_professional_x64.iso.txt | 0
...en_windows_xp_professional_x64_chk.iso.txt | 0
.../winxp/en_winxp_mce_2005_cd1.iso.txt | 0
.../winxp/en_winxp_mce_2005_cd2.iso.txt | 0
.../winxp/en_winxp_pro_with_sp2.iso.txt | 0
.../winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt | 0
.../winxp/en_winxp_tablet_2005_CD1.iso.txt | 0
.../winxp/en_winxp_tablet_2005_CD2.iso.txt | 0
.../winxp/en_winxp_tablet_cd2.iso.txt | 0
...th_service_pack_3_x86_cd_x14-92426.iso.txt | 0
410 files changed, 510 insertions(+), 10 deletions(-)
create mode 100755 scripts/osinfo-db-add-iso.py
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-builder-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-mate-20180913-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-20180913-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-20180913-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-icewm-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-jeos-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-kde5-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxde-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-mate-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-rescue-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-xfce-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.0/alt-education-8.0-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.0/alt-education-8.0-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-workstation-8.1-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-workstation-8.1-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-server-8.2-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-server-8.2-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-workstation-8.2-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-workstation-8.2-x86_64.iso.txt (100%)
rename tests/isodata/{sles => caasp}/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => caasp}/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => caasp}/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.9.0-arm64-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.9.0-ppc64el-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.9.0-s390x-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt (100%)
rename tests/isodata/{windows => win}/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_x86_dvd_6848121.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k/Win2000S-disk.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt (100%)
rename tests/isodata/{windows => win}/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_enterprise_x64.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_standard.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_standard_x64.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt (100%)
rename tests/isodata/{windows => win}/win7/Win7ProX86.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_unknown.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_unknown.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-32bit-English.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-32bit-English.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-64bit-English.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-64bit-English.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x64_dvd_915412.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/cz_winxp_pro_with_sp2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_win_xp_pro_n.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_x64.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_x64_chk.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_mce_2005_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_mce_2005_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_pro_with_sp2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_2005_CD1.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_2005_CD2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt (100%)
--
2.21.0
From crobinso at redhat.com Thu Mar 28 01:08:58 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 21:08:58 -0400
Subject: [Libosinfo] [PATCH osinfo-db 1/6] tests: isodata: use predictable
file layout
In-Reply-To:
References:
Message-ID:
Right now the structure is roughly
isodata/$distro/$shortid/...
but a few $distro cases are wrong. Fix them
Signed-off-by: Cole Robinson
---
.../{altlinux => alt}/alt.p8/alt-p8-builder-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-builder-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-mate-20180913-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-server-20180913-i586.iso.txt | 0
.../alt.p8/alt-p8-server-20180913-x86_64.iso.txt | 0
.../alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt | 0
.../alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt | 0
.../alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-i586.iso.txt | 0
.../{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt | 0
.../alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-gnome3-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-gnustep-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-icewm-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-jeos-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-kde5-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-lxde-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-lxqt-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-mate-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-mate-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-rescue-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-wmaker-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt | 0
.../alt.sisyphus/regular-xfce-20181017-i586.iso.txt | 0
.../alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt | 0
.../{altlinux => alt}/alt8.0/alt-education-8.0-i586.iso.txt | 0
.../{altlinux => alt}/alt8.0/alt-education-8.0-x86_64.iso.txt | 0
.../alt8.1/alt-kworkstation-8.1-install-i586.iso.txt | 0
.../alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt | 0
.../alt8.1/alt-kworkstation-8.1-live-i586.iso.txt | 0
.../alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt | 0
.../{altlinux => alt}/alt8.1/alt-workstation-8.1-i586.iso.txt | 0
.../{altlinux => alt}/alt8.1/alt-workstation-8.1-x86_64.iso.txt | 0
.../alt8.2/alt-kworkstation-8.2-install-i586.iso.txt | 0
.../alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt | 0
.../alt8.2/alt-kworkstation-8.2-live-i586.iso.txt | 0
.../alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt | 0
.../isodata/{altlinux => alt}/alt8.2/alt-server-8.2-i586.iso.txt | 0
.../{altlinux => alt}/alt8.2/alt-server-8.2-x86_64.iso.txt | 0
.../{altlinux => alt}/alt8.2/alt-simply-8.2.0-i586.iso.txt | 0
.../{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-i586.iso.txt | 0
.../{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt | 0
.../{altlinux => alt}/alt8.2/alt-simply-8.2.0-x86_64.iso.txt | 0
.../{altlinux => alt}/alt8.2/alt-workstation-8.2-i586.iso.txt | 0
.../{altlinux => alt}/alt8.2/alt-workstation-8.2-x86_64.iso.txt | 0
.../caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt | 0
.../caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt | 0
.../caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt | 0
.../sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt | 0
.../sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt | 0
.../sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt | 0
.../sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt | 0
...-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt | 0
...-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt | 0
...cation_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt | 0
...cation_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt | 0
.../win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt | 0
.../win10/en_windows_10_education_x86_dvd_6848121.iso.txt | 0
.../en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt | 0
.../en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt | 0
.../win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt | 0
.../win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt | 0
.../win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt | 0
...ition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt | 0
.../win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt | 0
...editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt | 0
.../en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt | 0
...terprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt | 0
tests/isodata/{windows => win}/win2k/Win2000S-disk.iso.txt | 0
...hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt | 0
.../en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt | 0
...ll_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt | 0
...windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt | 0
...rver_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt | 0
.../win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt | 0
.../win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt | 0
...t_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt | 0
.../en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt | 0
...n_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt | 0
...erver_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt | 0
..._server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt | 0
.../en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt | 0
..._windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt | 0
.../en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt | 0
.../en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt | 0
.../en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt | 0
.../win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt | 0
..._and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt | 0
..._server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt | 0
...1119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt | 0
.../win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt | 0
.../win2k3/en_windows_server_2003_enterprise_x64.iso.txt | 0
.../win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt | 0
.../win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt | 0
.../win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt | 0
.../win2k3/en_windows_server_2003_standard.iso.txt | 0
.../win2k3/en_windows_server_2003_standard_x64.iso.txt | 0
.../win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt | 0
.../win2k3/en_windows_server_2003_with_sp1_standard.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt | 0
.../en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt | 0
.../en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt | 0
..._win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt | 0
..._win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt | 0
.../en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt | 0
.../en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt | 0
.../win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt | 0
...en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt | 0
...en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt | 0
...r_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt | 0
...2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt | 0
...2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt | 0
..._2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt | 0
..._2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt | 0
.../win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt | 0
.../win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt | 0
.../win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt | 0
.../win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt | 0
...dows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt | 0
...2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt | 0
.../win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt | 0
..._enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt | 0
...andard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt | 0
...terprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt | 0
..._r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt | 0
.../en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt | 0
.../win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt | 0
...dows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt | 0
tests/isodata/{windows => win}/win7/Win7ProX86.iso.txt | 0
.../cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng | 0
.../cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt | 0
.../cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng | 0
.../cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt | 0
.../win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt | 0
.../win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt | 0
.../en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng | 0
.../en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt | 0
.../en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt | 0
.../win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng | 0
.../win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt | 0
.../win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng | 0
.../win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt | 0
.../en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt | 0
.../en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt | 0
.../win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng | 0
.../win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt | 0
.../win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng | 0
.../win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt | 0
.../en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt | 0
.../win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt | 0
.../en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt | 0
.../en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt | 0
.../win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt | 0
.../win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt | 0
.../en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt | 0
.../en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt | 0
.../win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt | 0
.../win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt | 0
.../en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt | 0
.../en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng | 0
.../en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt | 0
.../win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt | 0
.../win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt | 0
.../en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt | 0
.../en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt | 0
...dows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt | 0
...dows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt | 0
.../en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng | 0
.../en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt | 0
.../en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng | 0
.../en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt | 0
.../win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt | 0
.../win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt | 0
.../win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt | 0
.../win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt | 0
.../win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt | 0
.../en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt | 0
.../en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng | 0
.../en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt | 0
.../win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt | 0
.../win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt | 0
.../win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt | 0
.../win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt | 0
.../win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt | 0
.../win7/en_windows_7_ultimate_x64_dvd_unknown.lng | 0
.../win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng | 0
.../win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt | 0
.../win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt | 0
.../win7/en_windows_7_ultimate_x86_dvd_unknown.lng | 0
.../win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng | 0
.../win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt | 0
..._windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt | 0
..._windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt | 0
...dows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng | 0
...dows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt | 0
...dows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng | 0
...dows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt | 0
.../fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng | 0
.../fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt | 0
.../ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng | 0
.../ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt | 0
.../win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng | 0
.../win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt | 0
...-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt | 0
.../win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt | 0
.../win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt | 0
.../win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt | 0
.../win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt | 0
.../win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt | 0
.../win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt | 0
.../win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt | 0
.../win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt | 0
.../win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt | 0
.../win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt | 0
.../win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt | 0
.../win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt | 0
...n_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt | 0
...n_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt | 0
.../en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt | 0
.../win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt | 0
.../win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt | 0
.../en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt | 0
.../en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt | 0
.../en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt | 0
.../en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt | 0
.../win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt | 0
.../win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt | 0
.../win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt | 0
...n_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt | 0
...n_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt | 0
...windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt | 0
...windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt | 0
.../win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt | 0
.../win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt | 0
.../win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt | 0
.../win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt | 0
.../win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt | 0
.../win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt | 0
.../win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt | 0
.../win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt | 0
.../win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt | 0
.../win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt | 0
.../win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt | 0
.../win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt | 0
.../win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt | 0
.../win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt | 0
.../win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt | 0
.../win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt | 0
.../win8/Windows8-ConsumerPreview-32bit-English.iso.lng | 0
.../win8/Windows8-ConsumerPreview-32bit-English.iso.txt | 0
.../win8/Windows8-ConsumerPreview-64bit-English.iso.lng | 0
.../win8/Windows8-ConsumerPreview-64bit-English.iso.txt | 0
.../win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng | 0
.../win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt | 0
.../win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt | 0
.../win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt | 0
.../win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt | 0
.../win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt | 0
.../win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt | 0
.../win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt | 0
.../win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt | 0
.../win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt | 0
.../win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt | 0
.../win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt | 0
.../{windows => win}/win8/en-gb_windows_8_x64_dvd_915412.iso.txt | 0
.../{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.lng | 0
.../{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.txt | 0
.../win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng | 0
.../win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt | 0
.../win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng | 0
.../win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt | 0
...indows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng | 0
...indows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt | 0
...indows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng | 0
...indows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt | 0
...dows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng | 0
...dows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt | 0
...dows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng | 0
...dows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt | 0
.../win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng | 0
.../win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt | 0
.../win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng | 0
.../win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt | 0
.../win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng | 0
.../win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt | 0
.../win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng | 0
.../win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt | 0
.../en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng | 0
.../en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt | 0
.../en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng | 0
.../en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt | 0
.../{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.lng | 0
.../{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.txt | 0
.../{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.lng | 0
.../{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.txt | 0
.../win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng | 0
.../win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt | 0
.../win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng | 0
.../win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt | 0
.../win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng | 0
.../win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt | 0
.../win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng | 0
.../win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt | 0
.../{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.lng | 0
.../{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.txt | 0
.../{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.lng | 0
.../{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.txt | 0
.../{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.lng | 0
.../{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.txt | 0
.../winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt | 0
.../winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt | 0
...s_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt | 0
...s_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt | 0
.../en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt | 0
.../en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt | 0
...s_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt | 0
...vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt | 0
...s_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt | 0
...vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt | 0
...s_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt | 0
.../en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt | 0
.../winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt | 0
.../winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt | 0
.../winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt | 0
.../winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt | 0
...s_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt | 0
.../isodata/{windows => win}/winxp/cz_winxp_pro_with_sp2.iso.txt | 0
.../{windows => win}/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt | 0
tests/isodata/{windows => win}/winxp/en_win_xp_pro_n.iso.txt | 0
...xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt | 0
...p_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt | 0
...s_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt | 0
.../{windows => win}/winxp/en_windows_xp_professional_x64.iso.txt | 0
.../winxp/en_windows_xp_professional_x64_chk.iso.txt | 0
.../isodata/{windows => win}/winxp/en_winxp_mce_2005_cd1.iso.txt | 0
.../isodata/{windows => win}/winxp/en_winxp_mce_2005_cd2.iso.txt | 0
.../isodata/{windows => win}/winxp/en_winxp_pro_with_sp2.iso.txt | 0
.../{windows => win}/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt | 0
.../{windows => win}/winxp/en_winxp_tablet_2005_CD1.iso.txt | 0
.../{windows => win}/winxp/en_winxp_tablet_2005_CD2.iso.txt | 0
tests/isodata/{windows => win}/winxp/en_winxp_tablet_cd2.iso.txt | 0
...u_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt | 0
393 files changed, 0 insertions(+), 0 deletions(-)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-builder-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-mate-20180913-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-20180913-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-20180913-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-icewm-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-jeos-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-kde5-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxde-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-mate-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-rescue-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-xfce-20181017-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.0/alt-education-8.0-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.0/alt-education-8.0-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-workstation-8.1-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.1/alt-workstation-8.1-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-server-8.2-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-server-8.2-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-simply-8.2.0-x86_64.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-workstation-8.2-i586.iso.txt (100%)
rename tests/isodata/{altlinux => alt}/alt8.2/alt-workstation-8.2-x86_64.iso.txt (100%)
rename tests/isodata/{sles => caasp}/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => caasp}/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => caasp}/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt (100%)
rename tests/isodata/{sles => sle}/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt (100%)
rename tests/isodata/{windows => win}/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_education_x86_dvd_6848121.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt (100%)
rename tests/isodata/{windows => win}/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k/Win2000S-disk.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt (100%)
rename tests/isodata/{windows => win}/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_enterprise_x64.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_standard.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_standard_x64.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt (100%)
rename tests/isodata/{windows => win}/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt (100%)
rename tests/isodata/{windows => win}/win7/Win7ProX86.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_unknown.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_unknown.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng (100%)
rename tests/isodata/{windows => win}/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt (100%)
rename tests/isodata/{windows => win}/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-32bit-English.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-32bit-English.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-64bit-English.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/Windows8-ConsumerPreview-64bit-English.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x64_dvd_915412.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en-gb_windows_8_x86_dvd_915479.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x64_dvd_916091.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_n_x86_dvd_916097.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x64_dvd_915440.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/en_windows_8_x86_dvd_915417.iso.txt (100%)
rename tests/isodata/{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.lng (100%)
rename tests/isodata/{windows => win}/win8/fr_windows_8_x86_dvd_915420.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt (100%)
rename tests/isodata/{windows => win}/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/cz_winxp_pro_with_sp2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_win_xp_pro_n.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_x64.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_windows_xp_professional_x64_chk.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_mce_2005_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_mce_2005_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_pro_with_sp2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_2005_CD1.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_2005_CD2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/en_winxp_tablet_cd2.iso.txt (100%)
rename tests/isodata/{windows => win}/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt (100%)
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-builder-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-builder-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-builder-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-cinnamon-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-enlightenment-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnome3-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-gnustep-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-icewm-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-jeos-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde4-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-kde5-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxde-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-lxqt-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-mate-20180913-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-mate-20180913-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-mate-20180913-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-rescue-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-server-20180913-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-server-20180913-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-server-20180913-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-server-20180913-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-server-20180913-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-server-pve-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-tde-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-sysv-xfce-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-wmaker-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-i586.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-i586.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt b/tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt
rename to tests/isodata/alt/alt.p8/alt-p8-xfce-20180912-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-cinnamon-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-enlightenment-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnome3-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-gnustep-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-icewm-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-jeos-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-kde5-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxde-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-lxqt-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-mate-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-mate-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-mate-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-rescue-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-wmaker-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-i586.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-i586.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt b/tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt
rename to tests/isodata/alt/alt.sisyphus/regular-xfce-20181017-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.0/alt-education-8.0-i586.iso.txt b/tests/isodata/alt/alt8.0/alt-education-8.0-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.0/alt-education-8.0-i586.iso.txt
rename to tests/isodata/alt/alt8.0/alt-education-8.0-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.0/alt-education-8.0-x86_64.iso.txt b/tests/isodata/alt/alt8.0/alt-education-8.0-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.0/alt-education-8.0-x86_64.iso.txt
rename to tests/isodata/alt/alt8.0/alt-education-8.0-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-install-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt b/tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt
rename to tests/isodata/alt/alt8.1/alt-kworkstation-8.1-live-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-workstation-8.1-i586.iso.txt b/tests/isodata/alt/alt8.1/alt-workstation-8.1-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-workstation-8.1-i586.iso.txt
rename to tests/isodata/alt/alt8.1/alt-workstation-8.1-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.1/alt-workstation-8.1-x86_64.iso.txt b/tests/isodata/alt/alt8.1/alt-workstation-8.1-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.1/alt-workstation-8.1-x86_64.iso.txt
rename to tests/isodata/alt/alt8.1/alt-workstation-8.1-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-install-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-kworkstation-8.2-live-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-server-8.2-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-server-8.2-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-server-8.2-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-server-8.2-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-server-8.2-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-server-8.2-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-server-8.2-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-server-8.2-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-live-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-simply-8.2.0-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-simply-8.2.0-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-simply-8.2.0-x86_64.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-workstation-8.2-i586.iso.txt b/tests/isodata/alt/alt8.2/alt-workstation-8.2-i586.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-workstation-8.2-i586.iso.txt
rename to tests/isodata/alt/alt8.2/alt-workstation-8.2-i586.iso.txt
diff --git a/tests/isodata/altlinux/alt8.2/alt-workstation-8.2-x86_64.iso.txt b/tests/isodata/alt/alt8.2/alt-workstation-8.2-x86_64.iso.txt
similarity index 100%
rename from tests/isodata/altlinux/alt8.2/alt-workstation-8.2-x86_64.iso.txt
rename to tests/isodata/alt/alt8.2/alt-workstation-8.2-x86_64.iso.txt
diff --git a/tests/isodata/sles/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/caasp/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/caasp/caasp1.0/SUSE-CaaS-Platform-1.0-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/caasp/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/caasp/caasp2.0/SUSE-CaaS-Platform-2.0-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/caasp/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/caasp/caasp3.0/SUSE-CaaS-Platform-3.0-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-aarch64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-ppc64le-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-s390x-GM-DVD1.iso.txt
diff --git a/tests/isodata/sles/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/sle/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt
similarity index 100%
rename from tests/isodata/sles/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt
rename to tests/isodata/sle/sle15/SLE-15-Installer-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt b/tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt
similarity index 100%
rename from tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt
rename to tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X64FRE_EN-US.ISO.txt
diff --git a/tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt b/tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt
similarity index 100%
rename from tests/isodata/windows/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt
rename to tests/isodata/win/win10/14393.0.160715-1616.RS1_RELEASE_CLIENTENTERPRISE_S_EVAL_X86FRE_EN-GB.ISO.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt b/tests/isodata/win/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_n_version_1511_updated_apr_2016_x64_dvd_8705540.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt b/tests/isodata/win/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_n_version_1607_updated_jul_2016_x86_dvd_9055560.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt b/tests/isodata/win/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt b/tests/isodata/win/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
rename to tests/isodata/win/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt b/tests/isodata/win/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
rename to tests/isodata/win/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt b/tests/isodata/win/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt
rename to tests/isodata/win/win10/en_windows_10_multi-edition_version_1709_updated_sept_2017_x64_dvd_100090817.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt b/tests/isodata/win/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
rename to tests/isodata/win/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt b/tests/isodata/win/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt
rename to tests/isodata/win/win10/en_windows_10_n_multiple_editions_version_1607_updated_jul_2016_x64_dvd_9053861.iso.txt
diff --git a/tests/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt b/tests/isodata/win/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
rename to tests/isodata/win/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
diff --git a/tests/isodata/windows/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt b/tests/isodata/win/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt
similarity index 100%
rename from tests/isodata/windows/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt
rename to tests/isodata/win/win10/fr_windows_10_enterprise_version_1607_updated_jul_2016_x86_dvd_9057460.iso.txt
diff --git a/tests/isodata/windows/win2k/Win2000S-disk.iso.txt b/tests/isodata/win/win2k/Win2000S-disk.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k/Win2000S-disk.iso.txt
rename to tests/isodata/win/win2k/Win2000S-disk.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt b/tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
rename to tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt b/tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
rename to tests/isodata/win/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt b/tests/isodata/win/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
rename to tests/isodata/win/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
diff --git a/tests/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt b/tests/isodata/win/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
rename to tests/isodata/win/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt b/tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
rename to tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt b/tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
rename to tests/isodata/win/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt b/tests/isodata/win/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_server_2012_r2_x64_dvd_2707946.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt b/tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
diff --git a/tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt b/tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
rename to tests/isodata/win/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
diff --git a/tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt b/tests/isodata/win/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
similarity index 100%
rename from tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
rename to tests/isodata/win/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
diff --git a/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt b/tests/isodata/win/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
rename to tests/isodata/win/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_enterprise_x64.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_enterprise_x64.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_enterprise_x64.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_enterprise_x64.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_sp2_ia64_cd.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_sp2_x64_cd.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_sp2_x86_cd.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_standard.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_standard.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_standard.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_standard.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_standard_x64.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_standard_x64.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_standard_x64.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_standard_x64.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_enterprise.iso.txt
diff --git a/tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt b/tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt
rename to tests/isodata/win/win2k3/en_windows_server_2003_with_sp1_standard.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd1_x13-04790.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_with_sp2_cd2_x13-68583.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd1.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_cd2.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd1_x13-05757.iso.txt
diff --git a/tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt b/tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt
rename to tests/isodata/win/win2k3r2/en_win_srv_2003_r2_standard_x64_with_sp2_cd2_x13-68587.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_checked_build_x64_dvd_342435.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x64_dvd_342336.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt b/tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt
rename to tests/isodata/win/win2k8/en_windows_server_2008_with_sp2_x86_dvd_342333.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt b/tests/isodata/win/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt
rename to tests/isodata/win/win2k8/en_windows_web_server_2008_x64_dvd_X14-26683.iso.txt
diff --git a/tests/isodata/windows/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt b/tests/isodata/win/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt
rename to tests/isodata/win/win2k8/en_windows_web_server_2008_x86_dvd_X14-26678.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt b/tests/isodata/win/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt
rename to tests/isodata/win/win2k8r2/cz_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50363.img.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_edition_with_service_pack_1_x64_dvd_700562.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_hpc_x64_dvd_552761.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_with_sp1_x64_dvd_617601.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_standard_enterprise_datacenter_web_retail_build_x64_dvd_x15-50365.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_for_itanium_based_systems_ia64_dvd_617558.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt b/tests/isodata/win/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt
rename to tests/isodata/win/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt
diff --git a/tests/isodata/windows/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt b/tests/isodata/win/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt
similarity index 100%
rename from tests/isodata/windows/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt
rename to tests/isodata/win/win2k8r2/eng_windows_server_2008_r2_st_ent_dc_web_retail_x64_X15-50365.img.txt
diff --git a/tests/isodata/windows/win7/Win7ProX86.iso.txt b/tests/isodata/win/win7/Win7ProX86.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/Win7ProX86.iso.txt
rename to tests/isodata/win/win7/Win7ProX86.iso.txt
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.lng
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x64_dvd_u_676956.iso.txt
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.lng
diff --git a/tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt b/tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt
rename to tests/isodata/win/win7/cs_windows_7_professional_with_sp1_x86_dvd_u_677077.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt b/tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
rename to tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt b/tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
rename to tests/isodata/win/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x64_dvd_x16-11943.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_n_x86_dvd_x16-11935.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_x64_dvd_x15-70749.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng b/tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng
rename to tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt b/tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt
rename to tests/isodata/win/win7/en_windows_7_enterprise_x86_dvd_x15-70745.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt b/tests/isodata/win/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt b/tests/isodata/win/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x64_dvd_u_676549.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt b/tests/isodata/win/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
rename to tests/isodata/win/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng b/tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng
rename to tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_with_sp1_x86_dvd_u_677328.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x64_dvd_u_676939.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_with_sp1_x86_dvd_u_677056.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt b/tests/isodata/win/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
rename to tests/isodata/win/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_with_sp1_x86_dvd_u_678562.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt b/tests/isodata/win/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
rename to tests/isodata/win/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x64_dvd_u_677543.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng b/tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_with_sp1_x86_dvd_u_677597.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.lng
diff --git a/tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt b/tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
rename to tests/isodata/win/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt b/tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt
rename to tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt
diff --git a/tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt b/tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
rename to tests/isodata/win/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.lng
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.lng
diff --git a/tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt b/tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt
rename to tests/isodata/win/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt
diff --git a/tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng b/tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng
rename to tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.lng
diff --git a/tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt b/tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
rename to tests/isodata/win/win7/fr_windows_7_home_premium_n_with_sp1_x64_dvd_u_676833.iso.txt
diff --git a/tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng b/tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng
rename to tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.lng
diff --git a/tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt b/tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
rename to tests/isodata/win/win7/ru_windows_7_enterprise_with_sp1_x64_dvd_u_677671.iso.txt
diff --git a/tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng b/tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng
rename to tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.lng
diff --git a/tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt b/tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
similarity index 100%
rename from tests/isodata/windows/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
rename to tests/isodata/win/win7/ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8.1_enterprise_with_update_x86_dvd_4050369.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
diff --git a/tests/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt b/tests/isodata/win/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
rename to tests/isodata/win/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt b/tests/isodata/win/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x64_dvd_2971902.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
diff --git a/tests/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt b/tests/isodata/win/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
rename to tests/isodata/win/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.lng b/tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.lng
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.lng
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.txt b/tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-32bit-English.iso.txt
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-32bit-English.iso.txt
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.lng b/tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.lng
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.lng
diff --git a/tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.txt b/tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/Windows8-ConsumerPreview-64bit-English.iso.txt
rename to tests/isodata/win/win8/Windows8-ConsumerPreview-64bit-English.iso.txt
diff --git a/tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng b/tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng
rename to tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.lng
diff --git a/tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt b/tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt
rename to tests/isodata/win/win8/de_windows_8_enterprise_n_x64_dvd_917975.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.lng b/tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.lng
rename to tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.lng
diff --git a/tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.txt b/tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en-gb_windows_8_x86_dvd_915479.iso.txt
rename to tests/isodata/win/win8/en-gb_windows_8_x86_dvd_915479.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x64_dvd_917558.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt b/tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt
rename to tests/isodata/win/win8/en_windows_8_debug_checked_build_x86_dvd_917560.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x64_dvd_917527.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_debug_checked_build_x86_dvd_917529.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x64_dvd_917531.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_debug_checked_build_x86_dvd_917534.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x64_dvd_918052.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_n_x86_dvd_918707.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_x64_dvd_917522.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng b/tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng
rename to tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt b/tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt
rename to tests/isodata/win/win8/en_windows_8_enterprise_x86_dvd_917587.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x64_dvd_917562.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt b/tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_debug_checked_build_x86_dvd_917564.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.lng b/tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.txt b/tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x64_dvd_916091.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_x64_dvd_916091.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.lng b/tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.lng
rename to tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.txt b/tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_n_x86_dvd_916097.iso.txt
rename to tests/isodata/win/win8/en_windows_8_n_x86_dvd_916097.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x64_dvd_918677.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_n_vl_x86_dvd_918877.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x64_dvd_917699.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng b/tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt b/tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt
rename to tests/isodata/win/win8/en_windows_8_pro_vl_x86_dvd_917830.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.lng b/tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.lng
rename to tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.txt b/tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x64_dvd_915440.iso.txt
rename to tests/isodata/win/win8/en_windows_8_x64_dvd_915440.iso.txt
diff --git a/tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.lng b/tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.lng
rename to tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.lng
diff --git a/tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.txt b/tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/en_windows_8_x86_dvd_915417.iso.txt
rename to tests/isodata/win/win8/en_windows_8_x86_dvd_915417.iso.txt
diff --git a/tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.lng b/tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.lng
similarity index 100%
rename from tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.lng
rename to tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.lng
diff --git a/tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.txt b/tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.txt
similarity index 100%
rename from tests/isodata/windows/win8/fr_windows_8_x86_dvd_915420.iso.txt
rename to tests/isodata/win/win8/fr_windows_8_x86_dvd_915420.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt b/tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt b/tests/isodata/win/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
diff --git a/tests/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt b/tests/isodata/win/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
similarity index 100%
rename from tests/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
rename to tests/isodata/win/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
diff --git a/tests/isodata/windows/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt b/tests/isodata/win/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt
rename to tests/isodata/win/winxp/cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso.txt
diff --git a/tests/isodata/windows/winxp/cz_winxp_pro_with_sp2.iso.txt b/tests/isodata/win/winxp/cz_winxp_pro_with_sp2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/cz_winxp_pro_with_sp2.iso.txt
rename to tests/isodata/win/winxp/cz_winxp_pro_with_sp2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt b/tests/isodata/win/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt
rename to tests/isodata/win/winxp/en_winXP_Pro_x86_build2600_ISO.img.txt
diff --git a/tests/isodata/windows/winxp/en_win_xp_pro_n.iso.txt b/tests/isodata/win/winxp/en_win_xp_pro_n.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_win_xp_pro_n.iso.txt
rename to tests/isodata/win/winxp/en_win_xp_pro_n.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_n_with_service_pack_3_x86_cd_x14-92445.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_vl_x14-73974.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_x64.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_x64.iso.txt
diff --git a/tests/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt b/tests/isodata/win/winxp/en_windows_xp_professional_x64_chk.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_windows_xp_professional_x64_chk.iso.txt
rename to tests/isodata/win/winxp/en_windows_xp_professional_x64_chk.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt b/tests/isodata/win/winxp/en_winxp_mce_2005_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt
rename to tests/isodata/win/winxp/en_winxp_mce_2005_cd1.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt b/tests/isodata/win/winxp/en_winxp_mce_2005_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_mce_2005_cd2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt b/tests/isodata/win/winxp/en_winxp_pro_with_sp2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_pro_with_sp2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt b/tests/isodata/win/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt
rename to tests/isodata/win/winxp/en_winxp_sp1a_tablet_pc_cd1.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_tablet_2005_CD1.iso.txt b/tests/isodata/win/winxp/en_winxp_tablet_2005_CD1.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_tablet_2005_CD1.iso.txt
rename to tests/isodata/win/winxp/en_winxp_tablet_2005_CD1.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_tablet_2005_CD2.iso.txt b/tests/isodata/win/winxp/en_winxp_tablet_2005_CD2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_tablet_2005_CD2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_tablet_2005_CD2.iso.txt
diff --git a/tests/isodata/windows/winxp/en_winxp_tablet_cd2.iso.txt b/tests/isodata/win/winxp/en_winxp_tablet_cd2.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/en_winxp_tablet_cd2.iso.txt
rename to tests/isodata/win/winxp/en_winxp_tablet_cd2.iso.txt
diff --git a/tests/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt b/tests/isodata/win/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
similarity index 100%
rename from tests/isodata/windows/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
rename to tests/isodata/win/winxp/ru_windows_xp_home_with_service_pack_3_x86_cd_x14-92426.iso.txt
--
2.21.0
From crobinso at redhat.com Thu Mar 28 01:08:59 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 21:08:59 -0400
Subject: [Libosinfo] [PATCH osinfo-db 2/6] Add scripts/osinfo-db-add-iso.py
In-Reply-To:
References:
Message-ID: <581da944dd40fabe4517ee4880d2cf91a44644bf.1553735163.git.crobinso@redhat.com>
This script simplifies the process of adding new iso data to the
test suite and optionally filling in a block for the .
Call it like
./scripts/osinfo-db-add-iso.py SHORTID [--arch ARCH] ISOPATH
It will print a block template to stdout, and generate a
correctly named data file in tests/isodata/
Signed-off-by: Cole Robinson
---
scripts/osinfo-db-add-iso.py | 113 +++++++++++++++++++++++++++++++++++
1 file changed, 113 insertions(+)
create mode 100755 scripts/osinfo-db-add-iso.py
diff --git a/scripts/osinfo-db-add-iso.py b/scripts/osinfo-db-add-iso.py
new file mode 100755
index 0000000..8a16859
--- /dev/null
+++ b/scripts/osinfo-db-add-iso.py
@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+
+import argparse
+import distutils.spawn
+import os
+import sys
+import tempfile
+import time
+
+
+topdir = os.path.realpath(os.path.join(os.path.dirname(__file__), ".."))
+datadir = os.path.join(topdir, "data")
+sys.path.insert(0, topdir)
+os.environ["INTERNAL_OSINFO_DB_DATA_DIR"] = datadir
+
+import tests.isodata
+import tests.util
+
+
+def fail(msg):
+ print(msg)
+ sys.exit(1)
+
+
+##############################
+# main() and option handling #
+##############################
+
+def _parse_args():
+ desc = ("Helper script for adding iso test data to the test "
+ "suite, and matching data to the DB")
+ parser = argparse.ArgumentParser(description=desc)
+
+ parser.add_argument("shortid", help="Which short-id "
+ "the ISO is media for")
+ parser.add_argument("iso", help="The path to the ISO media")
+ parser.add_argument("--arch", default="x86_64",
+ help="The OS architecture the media is for. default=x86_64")
+
+ options = parser.parse_args()
+ return options
+
+
+def _main():
+ """
+ This is a template for new command line programs. Copy and edit it!
+ """
+ options = _parse_args()
+
+ iso = os.path.realpath(os.path.abspath(options.iso))
+ isoinfobin = distutils.spawn.find_executable("isoinfo")
+ if not os.path.exists(iso):
+ fail("iso does not exist: %s" % iso)
+ if not isoinfobin:
+ fail("isoinfo is not installed")
+
+ osxml = None
+ for o in tests.util.DataFiles.oses():
+ if o.shortid == options.shortid:
+ osxml = o
+ break
+ if not osxml:
+ fail("Did not find any os shortid=%s" % options.shortid)
+ return
+
+ destdir = os.path.join(topdir, "tests", "isodata", osxml.distro,
+ options.shortid)
+ destpath = os.path.join(destdir, os.path.basename(iso) + ".txt")
+
+ tmp = tempfile.NamedTemporaryFile()
+ ret = os.system("isoinfo -d -i %s > %s" % (iso, tmp.name))
+ if ret != 0:
+ fail("Command failed, returncode=%s" % ret)
+
+ # parse isoinfo
+ # output an example media block
+ isodata = tests.isodata.get_isodatamedia(tmp.name)
+ print("XML to add to %s :" % osxml.filename[len(topdir) + 1:] + ".in")
+ print()
+ print(" " % options.arch)
+ print(" XXX")
+ print(" ")
+
+ if isodata.volumeid:
+ print(" %s" % isodata.volumeid)
+ if isodata.systemid:
+ print(" %s" % isodata.systemid)
+ if isodata.publisherid:
+ print(" %s" % isodata.publisherid)
+ if isodata.applicationid:
+ print(" %s" %
+ isodata.applicationid)
+ if isodata.volumesize:
+ print(" %s" % isodata.volumesize)
+
+ print(" ")
+ print(" XXX")
+ print(" XXX")
+ print(" ")
+ print()
+
+ print("\n\nSleeping 5 seconds before writing test data to:\n%s" % destpath)
+ time.sleep(5)
+ if not os.path.exists(destdir):
+ os.system("mkdir -p %s" % destdir)
+ os.system("cp %s %s" % (tmp.name, destpath))
+ print("Done.")
+
+ return 0
+
+
+if __name__ == '__main__':
+ sys.exit(_main())
--
2.21.0
From crobinso at redhat.com Thu Mar 28 01:09:00 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 21:09:00 -0400
Subject: [Libosinfo] [PATCH osinfo-db 3/6] debian8: fix 8.10 iso media
detection
In-Reply-To:
References:
Message-ID: <123ba7600ee48e266e3686945f6d47885eb22e63.1553735163.git.crobinso@redhat.com>
And add some extra test content
Signed-off-by: Cole Robinson
---
data/os/debian.org/debian-8.xml.in | 4 +--
.../debian8/debian-8.10.0-amd64-DVD-1.iso.txt | 29 +++++++++++++++++++
.../debian-8.10.0-amd64-kde-CD-1.iso.txt | 29 +++++++++++++++++++
.../debian-8.10.0-amd64-netinst.iso.txt | 29 +++++++++++++++++++
.../debian8/debian-8.10.0-i386-DVD-3.iso.txt | 16 ++++++++++
5 files changed, 105 insertions(+), 2 deletions(-)
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 3752798..db6d8c8 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -35,7 +35,7 @@
http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/i386/iso-dvd/debian-8.10.0-i386-DVD-1.iso
- Debian 8.\d.\d i386 1
+ Debian 8.\d+.\d+ i386 .*
install.386/vmlinuz
install.386/initrd.gz
@@ -43,7 +43,7 @@
http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/amd64/iso-dvd/debian-8.10.0-amd64-DVD-1.iso
- Debian 8.\d.\d amd64 1
+ Debian 8.\d+.\d+ amd64 .*
install.amd/vmlinuz
install.amd/initrd.gz
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt
new file mode 100644
index 0000000..641ef6a
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 8.10.0 amd64 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 1937712
+El Torito VD version 1 found, boot catalog is in sector 5126
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14D7 5335
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt
new file mode 100644
index 0000000..0711a53
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 8.10.0 amd64 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 323072
+El Torito VD version 1 found, boot catalog is in sector 2050
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 8D3 2259
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt
new file mode 100644
index 0000000..26636ac
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 8.10.0 amd64 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 126976
+El Torito VD version 1 found, boot catalog is in sector 974
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 49F 1183
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt
new file mode 100644
index 0000000..15476f0
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 8.10.0 i386 3
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 2266228
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
--
2.21.0
From crobinso at redhat.com Thu Mar 28 01:09:01 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 21:09:01 -0400
Subject: [Libosinfo] [PATCH osinfo-db 4/6] debian8: add arm64, ppc64el,
s390x DVD output
In-Reply-To:
References:
Message-ID: <8414acc4592d7bd4b90d4744965a1942563c574a.1553735163.git.crobinso@redhat.com>
Signed-off-by: Cole Robinson
---
data/os/debian.org/debian-8.xml.in | 25 ++++++++++++++++
.../debian8/debian-8.9.0-arm64-DVD-1.iso.txt | 29 +++++++++++++++++++
.../debian-8.9.0-ppc64el-DVD-1.iso.txt | 16 ++++++++++
.../debian8/debian-8.9.0-s390x-DVD-1.iso.txt | 16 ++++++++++
4 files changed, 86 insertions(+)
create mode 100644 tests/isodata/debian/debian8/debian-8.9.0-arm64-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.9.0-ppc64el-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian8/debian-8.9.0-s390x-DVD-1.iso.txt
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index db6d8c8..4a8c307 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -48,6 +48,31 @@
install.amd/vmlinuz
install.amd/initrd.gz
+
+ http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/arm64/iso-dvd/debian-8.10.0-arm64-DVD-1.iso
+
+ Debian 8.\d+.\d+ arm64 .*
+
+ install.a64/vmlinuz
+ install.a64/initrd.gz
+
+
+ http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/ppc64el/iso-dvd/debian-8.10.0-ppc64el-DVD-1.iso
+
+ Debian 8.\d+.\d+ ppc64el .*
+
+ install/vmlinux
+ install/initrd.gz
+
+
+ http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/s390x/iso-dvd/debian-8.10.0-s390x-DVD-1.iso
+
+ Debian 8.\d+.\d+ s390x .*
+
+ boot/linux_vm
+ boot/root.bin
+
+
http://deb.debian.org/debian/dists/jessie/main/installer-i386
diff --git a/tests/isodata/debian/debian8/debian-8.9.0-arm64-DVD-1.iso.txt b/tests/isodata/debian/debian8/debian-8.9.0-arm64-DVD-1.iso.txt
new file mode 100644
index 0000000..12ee7df
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.9.0-arm64-DVD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 8.9.0 arm64 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.7 2017.06.29.211523, LIBISOBURN-1.4.7, LIBISOFS-1.4.7, LIBBURN-1.4.7
+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: 1905008
+El Torito VD version 1 found, boot catalog is in sector 5451
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 239 (Unknown Arch)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 340
+ Bootoff 154C 5452
diff --git a/tests/isodata/debian/debian8/debian-8.9.0-ppc64el-DVD-1.iso.txt b/tests/isodata/debian/debian8/debian-8.9.0-ppc64el-DVD-1.iso.txt
new file mode 100644
index 0000000..d47ec27
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.9.0-ppc64el-DVD-1.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 8.9.0 ppc64el 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.7 2017.06.29.211523, LIBISOBURN-1.4.7, LIBISOFS-1.4.7, LIBBURN-1.4.7
+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: 2292692
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/debian/debian8/debian-8.9.0-s390x-DVD-1.iso.txt b/tests/isodata/debian/debian8/debian-8.9.0-s390x-DVD-1.iso.txt
new file mode 100644
index 0000000..a7380fe
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.9.0-s390x-DVD-1.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 8.9.0 s390x 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.7 2017.06.29.211523, LIBISOBURN-1.4.7, LIBISOFS-1.4.7, LIBBURN-1.4.7
+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: 2291742
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
--
2.21.0
From crobinso at redhat.com Thu Mar 28 01:09:02 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 21:09:02 -0400
Subject: [Libosinfo] [PATCH osinfo-db 5/6] debian9: add ppc64el and s390x
data
In-Reply-To:
References:
Message-ID: <6a747dc0e8f7c081affde9a087d76870daedef9d.1553735163.git.crobinso@redhat.com>
And some other misc iso data I have lying around
Signed-off-by: Cole Robinson
---
data/os/debian.org/debian-9.xml.in | 55 +++++++++++++++++--
.../debian9/debian-9.3.0-amd64-DVD-1.iso.txt | 29 ++++++++++
.../debian-9.7.0-arm64-netinst.iso.txt | 29 ++++++++++
.../debian9/debian-9.7.0-i386-netinst.iso.txt | 29 ++++++++++
.../debian-9.7.0-ppc64el-DVD-1.iso.txt | 16 ++++++
.../debian-9.7.0-ppc64el-netinst.iso.txt | 16 ++++++
.../debian9/debian-9.7.0-s390x-DVD-1.iso.txt | 16 ++++++
.../debian-9.7.0-s390x-netinst.iso.txt | 16 ++++++
8 files changed, 202 insertions(+), 4 deletions(-)
create mode 100644 tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt
create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt
diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index 7ff402b..9a844f8 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -86,13 +86,31 @@
install.armhf/vmlinuz
install.armhf/initrd.gz
+
+
+ http://cdimage.debian.org/cdimage/release/9.8.0/ppc64el/iso-cd/debian-9.8.0-ppc64el-netinst.iso
+
+ Debian 9.(\d)+.(\d)+ ppc64el n
+
+ install/vmlinux
+ install/initrd.gz
+
+
+
+ http://cdimage.debian.org/cdimage/release/9.8.0/s390x/iso-cd/debian-9.8.0-s390x-netinst.iso
+
+ Debian 9.(\d)+.(\d)+ s390x n
+
+ boot/linux_vm
+ boot/root.bin
+
http://cdimage.debian.org/cdimage/release/9.8.0/i386/iso-dvd/debian-9.8.0-i386-DVD-1.iso
- Debian 9.(\d)+.(\d)+ i386 1
+ Debian 9.(\d)+.(\d)+ i386 (\d)+
install.386/vmlinuz
install.386/initrd.gz
@@ -101,7 +119,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-dvd/debian-9.8.0-amd64-DVD-1.iso
- Debian 9.(\d)+.(\d)+ amd64 1
+ Debian 9.(\d)+.(\d)+ amd64 (\d)+
install.amd/vmlinuz
install.amd/initrd.gz
@@ -110,7 +128,7 @@
http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-dvd/debian-9.8.0-arm64-DVD-1.iso
- Debian 9.(\d)+.(\d)+ arm64 1
+ Debian 9.(\d)+.(\d)+ arm64 (\d)+
install.arm64/vmlinuz
install.arm64/initrd.gz
@@ -119,11 +137,30 @@
http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-dvd/debian-9.8.0-armhf-DVD-1.iso
- Debian 9.(\d)+.(\d)+ armhf 1
+ Debian 9.(\d)+.(\d)+ armhf (\d)+
install.armhf/vmlinuz
install.armhf/initrd.gz
+
+
+ http://cdimage.debian.org/cdimage/release/9.8.0/ppc64el/iso-dvd/debian-9.8.0-ppc64el-DVD-1.iso
+
+ Debian 9.(\d)+.(\d)+ ppc64el (\d)+
+
+ install/vmlinux
+ install/initrd.gz
+
+
+
+ http://cdimage.debian.org/cdimage/release/9.8.0/s390x/iso-dvd/debian-9.8.0-s390x-DVD-1.iso
+
+ Debian 9.(\d)+.(\d)+ s390x (\d)+
+
+ boot/linux_vm
+ boot/root.bin
+
+
http://deb.debian.org/debian/dists/stretch/main/installer-i386
@@ -145,6 +182,16 @@
current/images/netboot/debian-installer/armhf/linux
current/images/netboot/debian-installer/armhf/initrd.gz
+
+ http://deb.debian.org/debian/dists/stretch/main/installer-s390x
+ current/images/generic/kernel.debian
+ current/images/generic/initrd.debian
+
+
+ http://deb.debian.org/debian/dists/stretch/main/installer-ppc64el
+ current/images/netboot/debian-installer/ppc64el/vmlinux
+ current/images/netboot/debian-installer/ppc64el/initrd.gz
+
diff --git a/tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt b/tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt
new file mode 100644
index 0000000..f156675
--- /dev/null
+++ b/tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 9.3.0 amd64 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 1935816
+El Torito VD version 1 found, boot catalog is in sector 5366
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 15C7 5575
diff --git a/tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt
new file mode 100644
index 0000000..4ab9e77
--- /dev/null
+++ b/tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 9.7.0 arm64 n
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 103424
+El Torito VD version 1 found, boot catalog is in sector 910
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 239 (Unknown Arch)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 340
+ Bootoff 38F 911
diff --git a/tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt
new file mode 100644
index 0000000..1ee1fe1
--- /dev/null
+++ b/tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 9.7.0 i386 n
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 193536
+El Torito VD version 1 found, boot catalog is in sector 949
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 44E 1102
diff --git a/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt
new file mode 100644
index 0000000..4bdf26e
--- /dev/null
+++ b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 9.7.0 ppc64el 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 2243683
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt
new file mode 100644
index 0000000..ee3b2dd
--- /dev/null
+++ b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 9.7.0 ppc64el n
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 105886
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt
new file mode 100644
index 0000000..c0c69ec
--- /dev/null
+++ b/tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 9.7.0 s390x 1
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 2204396
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt
new file mode 100644
index 0000000..3cbfb52
--- /dev/null
+++ b/tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Debian 9.7.0 s390x n
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.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: 83145
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
--
2.21.0
From crobinso at redhat.com Thu Mar 28 01:09:03 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 27 Mar 2019 21:09:03 -0400
Subject: [Libosinfo] [PATCH osinfo-db 6/6] debian9: Fix arm64 media paths
In-Reply-To:
References:
Message-ID: <18cd76a8b646a39eb6f3b263b640c0f5d448488e.1553735163.git.crobinso@redhat.com>
Signed-off-by: Cole Robinson
---
data/os/debian.org/debian-9.xml.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index 9a844f8..12c15c9 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -74,8 +74,8 @@
Debian 9.(\d)+.(\d)+ arm64 n
- install.arm64/vmlinuz
- install.arm64/initrd.gz
+ install.a64/vmlinuz
+ install.a64/initrd.gz
@@ -130,8 +130,8 @@
Debian 9.(\d)+.(\d)+ arm64 (\d)+
- install.arm64/vmlinuz
- install.arm64/initrd.gz
+ install.a64/vmlinuz
+ install.a64/initrd.gz
--
2.21.0
From crobinso at redhat.com Thu Mar 28 16:15:50 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 12:15:50 -0400
Subject: [Libosinfo] [libosinfo PATCH 0/8] Use "unknown" arch as a
fallback for media/tree detection
In-Reply-To:
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID:
On 3/27/19 7:38 AM, Fabiano Fid?ncio wrote:
> On Wed, Mar 27, 2019 at 12:24 PM Fabiano Fid?ncio wrote:
>>
>> This series has been written considering:
>> - https://www.redhat.com/archives/libosinfo/2019-February/msg00247.html
>> - a similar patch will be done for medias
>
> Well, Cole's patches just adds "unknown" to the architectures, so no
> similar patch is needed for medias :-)
> I'm wondering here whether "all" could be used for the same purpose as
> there's no such thing as a media or tree of all architectures.
>
> Anyways, Daniel, is "unknown" fine? Would you prefer going for
> "fallback" instead? Or just abuse the meaning of "all"?
>
Yes I think arch="all" is nicer, it's a better name and we already use
that pattern for resources arch="all" so there is precedent
Thanks,
Cole
From crobinso at redhat.com Thu Mar 28 16:18:10 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 12:18:10 -0400
Subject: [Libosinfo] [libosinfo PATCH 2/8] db: Rename os_* to
os_treeinfo_* in guess_os_from_tree()
In-Reply-To: <20190327112430.10360-3-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
<20190327112430.10360-3-fidencio@redhat.com>
Message-ID:
On 3/27/19 7:24 AM, Fabiano Fid?ncio wrote:
> It'll make clear that we're dealing with the treeinfo attributes and not
> with the tree ones.
>
> https://gitlab.com/libosinfo/libosinfo/issues/20
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/osinfo_db.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index 3795903..136cf79 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -785,23 +785,23 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
>
> for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
> OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
> - const gchar *os_family;
> - const gchar *os_variant;
> - const gchar *os_version;
> - const gchar *os_arch;
> + const gchar *os_treeinfo_family;
> + const gchar *os_treeinfo_variant;
> + const gchar *os_treeinfo_version;
> + const gchar *os_treeinfo_arch;
>
> if (!osinfo_tree_has_treeinfo(os_tree))
> continue;
>
> - os_family = osinfo_tree_get_treeinfo_family(os_tree);
> - os_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> - os_version = osinfo_tree_get_treeinfo_version(os_tree);
> - os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
> + os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
> + os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> + os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
> + os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
>
> - if (match_regex(os_family, treeinfo_family) &&
> - match_regex(os_variant, treeinfo_variant) &&
> - match_regex(os_version, treeinfo_version) &&
> - match_regex(os_arch, treeinfo_arch)) {
> + if (match_regex(os_treeinfo_family, treeinfo_family) &&
> + match_regex(os_treeinfo_variant, treeinfo_variant) &&
> + match_regex(os_treeinfo_version, treeinfo_version) &&
> + match_regex(os_treeinfo_arch, treeinfo_arch)) {
> ret = os;
> if (matched_tree != NULL)
> *matched_tree = os_tree;
>
These first 2 are improvements and can go in while we sort the bigger
question
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Thu Mar 28 16:24:19 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 12:24:19 -0400
Subject: [Libosinfo] [libosinfo PATCH 0/8] Use "unknown" arch as a
fallback for media/tree detection
In-Reply-To:
References: <20190327112430.10360-1-fidencio@redhat.com>
Message-ID: <488be67e-311e-343d-6f94-a914ea99789f@redhat.com>
On 3/28/19 12:15 PM, Cole Robinson wrote:
> On 3/27/19 7:38 AM, Fabiano Fid?ncio wrote:
>> On Wed, Mar 27, 2019 at 12:24 PM Fabiano Fid?ncio wrote:
>>>
>>> This series has been written considering:
>>> - https://www.redhat.com/archives/libosinfo/2019-February/msg00247.html
>>> - a similar patch will be done for medias
>>
>> Well, Cole's patches just adds "unknown" to the architectures, so no
>> similar patch is needed for medias :-)
>> I'm wondering here whether "all" could be used for the same purpose as
>> there's no such thing as a media or tree of all architectures.
>>
>> Anyways, Daniel, is "unknown" fine? Would you prefer going for
>> "fallback" instead? Or just abuse the meaning of "all"?
>>
>
> Yes I think arch="all" is nicer, it's a better name and we already use
> that pattern for resources arch="all" so there is precedent
>
ccing Dan too who wasn't on the original CC
- Cole
From crobinso at redhat.com Thu Mar 28 16:36:04 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 12:36:04 -0400
Subject: [Libosinfo] [libosinfo PATCH 4/8] db: Deal with "unknown" tree
architectures
In-Reply-To: <20190327112430.10360-5-fidencio@redhat.com>
References: <20190327112430.10360-1-fidencio@redhat.com>
<20190327112430.10360-5-fidencio@redhat.com>
Message-ID:
On 3/27/19 7:24 AM, Fabiano Fid?ncio wrote:
> https://gitlab.com/libosinfo/libosinfo/issues/20
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> osinfo/osinfo_db.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index b6d9282..1038142 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -761,6 +761,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> OsinfoOs *ret = NULL;
> GList *oss = NULL;
> GList *os_iter;
> + GList *unknown_oss = NULL;
> const gchar *tree_arch;
> const gchar *treeinfo_family;
> const gchar *treeinfo_variant;
> @@ -797,6 +798,11 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> continue;
>
> os_tree_arch = osinfo_tree_get_architecture(os_tree);
> + if (g_str_equal(os_tree_arch, "unknown")) {
> + unknown_oss = g_list_prepend(unknown_oss, os);
> + continue;
> + }
> +
> os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
> os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
> @@ -817,11 +823,49 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
> g_list_free(trees);
> g_object_unref(tree_list);
>
> + if (ret)
> + goto end;
> + }
> +
> + for (os_iter = unknown_oss; os_iter; os_iter = os_iter->next) {
> + OsinfoOs *os = OSINFO_OS(os_iter->data);
> + OsinfoTreeList *tree_list = osinfo_os_get_tree_list(os);
> + GList *trees = osinfo_list_get_elements(OSINFO_LIST(tree_list));
> + GList *tree_iter;
> +
> + for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
> + OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
> + const gchar *os_treeinfo_family;
> + const gchar *os_treeinfo_variant;
> + const gchar *os_treeinfo_version;
> + const gchar *os_treeinfo_arch;
> +
> + os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
> + os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
> + os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
> + os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
> +
> + if (match_regex(os_treeinfo_family, treeinfo_family) &&
> + match_regex(os_treeinfo_variant, treeinfo_variant) &&
> + match_regex(os_treeinfo_version, treeinfo_version) &&
> + match_regex(os_treeinfo_arch, treeinfo_arch)) {
> + ret = os;
> + if (matched_tree != NULL)
> + *matched_tree = os_tree;
> + break;
> + }
> + }
> +
> + g_list_free(trees);
> + g_object_unref(tree_list);
> +
This is a lot of duplication, I realize the code paths aren't completely
identical but I suggest moving this to something like compare_tree or
compare_treelist or similar
- Cole
From crobinso at redhat.com Thu Mar 28 17:10:58 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 13:10:58 -0400
Subject: [Libosinfo] [osinfo-db PATCH 1/4] fedora: Split rawhide from
unknown
In-Reply-To: <20190326120039.25046-1-fidencio@redhat.com>
References: <20190326120039.25046-1-fidencio@redhat.com>
Message-ID: <1cceed0c-6cf4-5505-3ab3-92673a08cae0@redhat.com>
On 3/26/19 8:00 AM, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio
> ---
> .../fedoraproject.org/fedora-rawhide.xml.in | 63 +++++++++++++++++++
> .../fedoraproject.org/fedora-unknown.xml.in | 4 +-
> 2 files changed, 65 insertions(+), 2 deletions(-)
> create mode 100644 data/os/fedoraproject.org/fedora-rawhide.xml.in
>
> diff --git a/data/os/fedoraproject.org/fedora-rawhide.xml.in b/data/os/fedoraproject.org/fedora-rawhide.xml.in
> new file mode 100644
> index 0000000..ca866d8
> --- /dev/null
> +++ b/data/os/fedoraproject.org/fedora-rawhide.xml.in
> @@ -0,0 +1,63 @@
> +
> +
> +
> + rawhide
I think the name should be fedora-rawhide
- Cole
From crobinso at redhat.com Thu Mar 28 17:13:11 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 13:13:11 -0400
Subject: [Libosinfo] [osinfo-db PATCH 1/4] fedora: Split rawhide from
unknown
In-Reply-To: <1cceed0c-6cf4-5505-3ab3-92673a08cae0@redhat.com>
References: <20190326120039.25046-1-fidencio@redhat.com>
<1cceed0c-6cf4-5505-3ab3-92673a08cae0@redhat.com>
Message-ID:
On 3/28/19 1:10 PM, Cole Robinson wrote:
> On 3/26/19 8:00 AM, Fabiano Fid?ncio wrote:
>> Signed-off-by: Fabiano Fid?ncio
>> ---
>> .../fedoraproject.org/fedora-rawhide.xml.in | 63 +++++++++++++++++++
>> .../fedoraproject.org/fedora-unknown.xml.in | 4 +-
>> 2 files changed, 65 insertions(+), 2 deletions(-)
>> create mode 100644 data/os/fedoraproject.org/fedora-rawhide.xml.in
>>
>> diff --git a/data/os/fedoraproject.org/fedora-rawhide.xml.in b/data/os/fedoraproject.org/fedora-rawhide.xml.in
>> new file mode 100644
>> index 0000000..ca866d8
>> --- /dev/null
>> +++ b/data/os/fedoraproject.org/fedora-rawhide.xml.in
>> @@ -0,0 +1,63 @@
>> +
>> +
>> +
>> + rawhide
>
> I think the name should be fedora-rawhide
>
Also -unknown can probably inherit from fedora-rawhide and then we bump
fedora-rawhide dep, right? As is we will need to constantly adjust 2
files on new Fedora releases.
With those 2 things adjusted, for the series:
Reviewed-by: Cole Robinson
- Cole
From crobinso at redhat.com Thu Mar 28 20:55:31 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 16:55:31 -0400
Subject: [Libosinfo] [PATCH osinfo-db 0/3] tests: push Makefile bits to
conftest.py
Message-ID:
This series pushes the recent Makefile 'make check' bits into
tests/conftest.py init code. This means there is now no difference
between invoking pytest directly and calling 'make check'.
Tested on freebsd12.0 (for the locale handling) and debian9 (for
the log-level=info handling)
Cole Robinson (3):
tests: conftest: add pytest_configure
tests: conftest: Handle default log-level setting
tests: conftest: Set locale in test code
Makefile | 4 +---
tests/conftest.py | 29 +++++++++++++++++------------
2 files changed, 18 insertions(+), 15 deletions(-)
--
2.21.0
From crobinso at redhat.com Thu Mar 28 20:55:32 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 16:55:32 -0400
Subject: [Libosinfo] [PATCH osinfo-db 1/3] tests: conftest: add
pytest_configure
In-Reply-To:
References:
Message-ID: <70c943187b20d2ae9bd137df34ebb039cd84ed30.1553806397.git.crobinso@redhat.com>
This is a standard function to do post option parsing configuration,
like setting our environment variable
Signed-off-by: Cole Robinson
---
tests/conftest.py | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index 5f9cd5b..67b3a6f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,20 +4,21 @@
import os
-def _setup_env():
+def pytest_addoption(parser):
+ parser.addoption("--network-tests", action="store_true", default=False,
+ help=("Run osinfo-db network tests. Same tests as triggered "
+ "by setting env variable OSINFO_DB_NETWORK_TESTS"))
+
+
+def pytest_configure(config):
key = "INTERNAL_OSINFO_DB_DATA_DIR"
if key not in os.environ:
os.environ[key] = os.path.realpath(os.path.join(
os.path.dirname(__file__), "..", "data"))
-
-_setup_env()
-
-
-def pytest_addoption(parser):
- parser.addoption("--network-tests", action="store_true", default=False,
- help=("Run osinfo-db network tests. Same tests as triggered "
- "by setting env variable OSINFO_DB_NETWORK_TESTS"))
+ # This will trigger some DATA_DIR validation
+ from . import util
+ dummy = util
def pytest_ignore_collect(path, config):
@@ -28,8 +29,3 @@ def pytest_ignore_collect(path, config):
os.environ.get("OSINFO_DB_NETWORK_TESTS"))
if os.path.basename(str(path)) == "test_urls.py" and not run_network:
return True
-
-
-# This will trigger some DATA_DIR validation
-from . import util
-dummy = util
--
2.21.0
From crobinso at redhat.com Thu Mar 28 20:55:33 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 16:55:33 -0400
Subject: [Libosinfo] [PATCH osinfo-db 2/3] tests: conftest: handle default
log-level setting
In-Reply-To:
References:
Message-ID: <82000a0612ab00a09dee2de9caaa062246e740df.1553806397.git.crobinso@redhat.com>
This makes log-level=info the default for direct pytest-3 invocations,
and lets us drop the fallback detection in Makefile
Signed-off-by: Cole Robinson
---
Makefile | 4 +---
tests/conftest.py | 5 +++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 9d7f109..b3e06d5 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,6 @@ ZANATA = zanata
PYTHON = python3
-PYTEST_LOG_LEVEL = $(shell $(PYTHON) -m pytest --help | grep log-level >/dev/null && echo "--log-level=info")
-
V = 0
V_I18N = $(V_I18N_$(V))
@@ -123,4 +121,4 @@ update-po:
done
check: $(DATA_FILES) $(SCHEMA_FILES)
- LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest $(PYTEST_LOG_LEVEL)
+ LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest
diff --git a/tests/conftest.py b/tests/conftest.py
index 67b3a6f..4a16a04 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -16,6 +16,11 @@ def pytest_configure(config):
os.environ[key] = os.path.realpath(os.path.join(
os.path.dirname(__file__), "..", "data"))
+ # Default to --log-level=info if not otherwise specified
+ if (hasattr(config.option, "log_level") and
+ config.option.log_level is None):
+ config.option.log_level = "info"
+
# This will trigger some DATA_DIR validation
from . import util
dummy = util
--
2.21.0
From crobinso at redhat.com Thu Mar 28 20:55:34 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 28 Mar 2019 16:55:34 -0400
Subject: [Libosinfo] [PATCH osinfo-db 3/3] tests: conftest: set locale in
test code
In-Reply-To:
References:
Message-ID: <445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
This fixes the locale setup with direct pytest-3 invocations
Signed-off-by: Cole Robinson
---
Makefile | 2 +-
tests/conftest.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b3e06d5..4f6f8d4 100644
--- a/Makefile
+++ b/Makefile
@@ -121,4 +121,4 @@ update-po:
done
check: $(DATA_FILES) $(SCHEMA_FILES)
- LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest
+ $(PYTHON) -m pytest
diff --git a/tests/conftest.py b/tests/conftest.py
index 4a16a04..ade36c5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,7 @@
# This work is licensed under the GNU GPLv2 or later.
# See the COPYING file in the top-level directory.
+import locale
import os
@@ -16,6 +17,9 @@ def pytest_configure(config):
os.environ[key] = os.path.realpath(os.path.join(
os.path.dirname(__file__), "..", "data"))
+ # Needed for test reproducibility on freebsd
+ locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
+
# Default to --log-level=info if not otherwise specified
if (hasattr(config.option, "log_level") and
config.option.log_level is None):
--
2.21.0
From fidencio at redhat.com Thu Mar 28 21:26:06 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:06 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 0/8] Use "all" arch as a fallback
for media/tree detection
Message-ID: <20190328212614.25589-1-fidencio@redhat.com>
This series has been written considering:
- https://www.redhat.com/archives/libosinfo/2019-February/msg00247.html
Let's assume that trees and medias set with architecture "all" will be
treated as fallback, always.
https://gitlab.com/libosinfo/libosinfo/issues/20
Fabiano Fid?ncio (8):
db: Rename tree to treeinfo in guess_os_from_tree()
db: Rename os_* to os_treeinfo_* in guess_os_from_tree()
db: Consider the tree arch when guessing an OS from tree
db: Deal with "all" tree architectures
test-db: Add test for guessing tree from OS
db: Consider the media arch when guess an OS from media
db: Deal with "all" media architecture
test-db: Add test to cover identifying a media with "unknown" arch
osinfo/osinfo_db.c | 184 ++++++++++++------
.../dbdata/os/libosinfo.org/test-db-media.xml | 14 ++
.../dbdata/os/libosinfo.org/test-db-tree.xml | 25 +++
tests/test-db.c | 78 ++++++++
4 files changed, 237 insertions(+), 64 deletions(-)
create mode 100644 tests/dbdata/os/libosinfo.org/test-db-tree.xml
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:07 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:07 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 1/8] db: Rename tree to treeinfo in
guess_os_from_tree()
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-2-fidencio@redhat.com>
It'll make clear that we're dealing with the treeinfo attributes and not
with the tree ones.
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
Reviewed-by: Cole Robinson
---
osinfo/osinfo_db.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index fa217a2..3795903 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -761,18 +761,18 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
OsinfoOs *ret = NULL;
GList *oss = NULL;
GList *os_iter;
- const gchar *tree_family;
- const gchar *tree_variant;
- const gchar *tree_version;
- const gchar *tree_arch;
+ const gchar *treeinfo_family;
+ const gchar *treeinfo_variant;
+ const gchar *treeinfo_version;
+ const gchar *treeinfo_arch;
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
g_return_val_if_fail(tree != NULL, NULL);
- tree_family = osinfo_tree_get_treeinfo_family(tree);
- tree_variant = osinfo_tree_get_treeinfo_variant(tree);
- tree_version = osinfo_tree_get_treeinfo_version(tree);
- tree_arch = osinfo_tree_get_treeinfo_arch(tree);
+ treeinfo_family = osinfo_tree_get_treeinfo_family(tree);
+ treeinfo_variant = osinfo_tree_get_treeinfo_variant(tree);
+ treeinfo_version = osinfo_tree_get_treeinfo_version(tree);
+ treeinfo_arch = osinfo_tree_get_treeinfo_arch(tree);
oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses));
for (os_iter = oss; os_iter; os_iter = os_iter->next) {
@@ -798,10 +798,10 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
os_version = osinfo_tree_get_treeinfo_version(os_tree);
os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex(os_family, tree_family) &&
- match_regex(os_variant, tree_variant) &&
- match_regex(os_version, tree_version) &&
- match_regex(os_arch, tree_arch)) {
+ if (match_regex(os_family, treeinfo_family) &&
+ match_regex(os_variant, treeinfo_variant) &&
+ match_regex(os_version, treeinfo_version) &&
+ match_regex(os_arch, treeinfo_arch)) {
ret = os;
if (matched_tree != NULL)
*matched_tree = os_tree;
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:08 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:08 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 2/8] db: Rename os_* to
os_treeinfo_* in guess_os_from_tree()
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-3-fidencio@redhat.com>
It'll make clear that we're dealing with the treeinfo attributes and not
with the tree ones.
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
Reviewed-by: Cole Robinson
---
osinfo/osinfo_db.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 3795903..136cf79 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -785,23 +785,23 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
- const gchar *os_family;
- const gchar *os_variant;
- const gchar *os_version;
- const gchar *os_arch;
+ const gchar *os_treeinfo_family;
+ const gchar *os_treeinfo_variant;
+ const gchar *os_treeinfo_version;
+ const gchar *os_treeinfo_arch;
if (!osinfo_tree_has_treeinfo(os_tree))
continue;
- os_family = osinfo_tree_get_treeinfo_family(os_tree);
- os_variant = osinfo_tree_get_treeinfo_variant(os_tree);
- os_version = osinfo_tree_get_treeinfo_version(os_tree);
- os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
+ os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
+ os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
+ os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
+ os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex(os_family, treeinfo_family) &&
- match_regex(os_variant, treeinfo_variant) &&
- match_regex(os_version, treeinfo_version) &&
- match_regex(os_arch, treeinfo_arch)) {
+ if (match_regex(os_treeinfo_family, treeinfo_family) &&
+ match_regex(os_treeinfo_variant, treeinfo_variant) &&
+ match_regex(os_treeinfo_version, treeinfo_version) &&
+ match_regex(os_treeinfo_arch, treeinfo_arch)) {
ret = os;
if (matched_tree != NULL)
*matched_tree = os_tree;
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:09 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:09 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 3/8] db: Consider the tree arch
when guessing an OS from tree
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-4-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 136cf79..b6d9282 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -761,6 +761,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
OsinfoOs *ret = NULL;
GList *oss = NULL;
GList *os_iter;
+ const gchar *tree_arch;
const gchar *treeinfo_family;
const gchar *treeinfo_variant;
const gchar *treeinfo_version;
@@ -769,6 +770,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
g_return_val_if_fail(tree != NULL, NULL);
+ tree_arch = osinfo_tree_get_architecture(tree);
treeinfo_family = osinfo_tree_get_treeinfo_family(tree);
treeinfo_variant = osinfo_tree_get_treeinfo_variant(tree);
treeinfo_version = osinfo_tree_get_treeinfo_version(tree);
@@ -785,6 +787,7 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
+ const gchar *os_tree_arch;
const gchar *os_treeinfo_family;
const gchar *os_treeinfo_variant;
const gchar *os_treeinfo_version;
@@ -793,12 +796,14 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
if (!osinfo_tree_has_treeinfo(os_tree))
continue;
+ os_tree_arch = osinfo_tree_get_architecture(os_tree);
os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex(os_treeinfo_family, treeinfo_family) &&
+ if (match_regex(os_tree_arch, tree_arch) &&
+ match_regex(os_treeinfo_family, treeinfo_family) &&
match_regex(os_treeinfo_variant, treeinfo_variant) &&
match_regex(os_treeinfo_version, treeinfo_version) &&
match_regex(os_treeinfo_arch, treeinfo_arch)) {
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:10 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:10 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 4/8] db: Deal with "all" tree
architectures
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-5-fidencio@redhat.com>
Trees with "all" architecture are used as a fallback when guessing an OS
from a tree.
Knowing that, any entry with "all" architecture should not be considered
when first comparing the trees, thus those are skipped and, later on,
if no match has been found, those are used.
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 82 +++++++++++++++++++++++++++++-----------------
1 file changed, 52 insertions(+), 30 deletions(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index b6d9282..ff731ed 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -742,24 +742,12 @@ gboolean osinfo_db_identify_media(OsinfoDb *db, OsinfoMedia *media)
return TRUE;
}
-
-/**
- * osinfo_db_guess_os_from_tree:
- * @db: the database
- * @tree: the installation tree
- * @matched_tree: (out) (transfer none) (allow-none): the matched operating
- * system tree
- *
- * Guess operating system given an #OsinfoTree object.
- *
- * Returns: (transfer none): the operating system, or NULL if guessing failed
- */
-OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
- OsinfoTree *tree,
- OsinfoTree **matched_tree)
+static gboolean compare_tree(OsinfoTree *tree,
+ GList *oss,
+ OsinfoOs **ret_os,
+ OsinfoTree **matched,
+ GList **fallback_oss)
{
- OsinfoOs *ret = NULL;
- GList *oss = NULL;
GList *os_iter;
const gchar *tree_arch;
const gchar *treeinfo_family;
@@ -767,27 +755,21 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
const gchar *treeinfo_version;
const gchar *treeinfo_arch;
- g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
- g_return_val_if_fail(tree != NULL, NULL);
-
tree_arch = osinfo_tree_get_architecture(tree);
treeinfo_family = osinfo_tree_get_treeinfo_family(tree);
treeinfo_variant = osinfo_tree_get_treeinfo_variant(tree);
treeinfo_version = osinfo_tree_get_treeinfo_version(tree);
treeinfo_arch = osinfo_tree_get_treeinfo_arch(tree);
- oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses));
for (os_iter = oss; os_iter; os_iter = os_iter->next) {
OsinfoOs *os = OSINFO_OS(os_iter->data);
OsinfoTreeList *tree_list = osinfo_os_get_tree_list(os);
GList *trees = osinfo_list_get_elements(OSINFO_LIST(tree_list));
GList *tree_iter;
- //trees = g_list_sort(trees, tree_family_compare);
-
for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
- const gchar *os_tree_arch;
+ const gchar *os_tree_arch = NULL;
const gchar *os_treeinfo_family;
const gchar *os_treeinfo_variant;
const gchar *os_treeinfo_version;
@@ -797,19 +779,26 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
continue;
os_tree_arch = osinfo_tree_get_architecture(os_tree);
+ if (fallback_oss != NULL) {
+ if (g_str_equal(os_tree_arch, "all")) {
+ *fallback_oss = g_list_prepend(*fallback_oss, os);
+ continue;
+ }
+ }
+
os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree);
os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree);
os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree);
os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex(os_tree_arch, tree_arch) &&
+ if ((g_str_equal(os_tree_arch, "all") || match_regex(os_tree_arch, tree_arch)) &&
match_regex(os_treeinfo_family, treeinfo_family) &&
match_regex(os_treeinfo_variant, treeinfo_variant) &&
match_regex(os_treeinfo_version, treeinfo_version) &&
match_regex(os_treeinfo_arch, treeinfo_arch)) {
- ret = os;
- if (matched_tree != NULL)
- *matched_tree = os_tree;
+ *ret_os = os;
+ if (matched != NULL)
+ *matched = os_tree;
break;
}
}
@@ -817,11 +806,44 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
g_list_free(trees);
g_object_unref(tree_list);
- if (ret)
- break;
+ if (*ret_os != NULL)
+ return TRUE;
}
+ return FALSE;
+}
+
+/**
+ * osinfo_db_guess_os_from_tree:
+ * @db: the database
+ * @tree: the installation tree
+ * @matched_tree: (out) (transfer none) (allow-none): the matched operating
+ * system tree
+ *
+ * Guess operating system given an #OsinfoTree object.
+ *
+ * Returns: (transfer none): the operating system, or NULL if guessing failed
+ */
+OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
+ OsinfoTree *tree,
+ OsinfoTree **matched_tree)
+{
+ OsinfoOs *ret = NULL;
+ GList *oss = NULL;
+ GList *fallback_oss = NULL;
+
+ g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
+ g_return_val_if_fail(tree != NULL, NULL);
+
+ oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses));
+ if (compare_tree(tree, oss, &ret, matched_tree, &fallback_oss))
+ goto end;
+
+ compare_tree(tree, fallback_oss, &ret, matched_tree, NULL);
+
+ end:
g_list_free(oss);
+ g_list_free(fallback_oss);
return ret;
}
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:11 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:11 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 5/8] test-db: Add test for guessing
tree from OS
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-6-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.../dbdata/os/libosinfo.org/test-db-tree.xml | 25 +++++++++
tests/test-db.c | 53 +++++++++++++++++++
2 files changed, 78 insertions(+)
create mode 100644 tests/dbdata/os/libosinfo.org/test-db-tree.xml
diff --git a/tests/dbdata/os/libosinfo.org/test-db-tree.xml b/tests/dbdata/os/libosinfo.org/test-db-tree.xml
new file mode 100644
index 0000000..420e8bb
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-db-tree.xml
@@ -0,0 +1,25 @@
+
+
+
+ db-tree
+ DB Tree
+ unknown
+ libosinfo.org
+ test
+
+
+
+ Tree
+ unknown
+
+
+
+
+
+ Tree
+ unknown
+
+
+
+
+
diff --git a/tests/test-db.c b/tests/test-db.c
index a0fa490..d5e8b49 100644
--- a/tests/test-db.c
+++ b/tests/test-db.c
@@ -450,6 +450,57 @@ test_identify_media(void)
}
+static OsinfoTree *
+create_tree(const gchar *arch)
+{
+ OsinfoTree *tree;
+
+ tree = osinfo_tree_new("foo", arch);
+ osinfo_entity_set_param(OSINFO_ENTITY(tree),
+ OSINFO_TREE_PROP_TREEINFO_FAMILY,
+ "Tree");
+ osinfo_entity_set_param(OSINFO_ENTITY(tree),
+ OSINFO_TREE_PROP_TREEINFO_VERSION,
+ "unknown");
+ return tree;
+}
+
+
+static void
+test_guess_os_from_tree(void)
+{
+ OsinfoLoader *loader = osinfo_loader_new();
+ OsinfoDb *db;
+ OsinfoTree *tree;
+ OsinfoTree *matched_tree = NULL;
+ OsinfoOs *os;
+
+ GError *error = NULL;
+
+ osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error);
+ g_assert_no_error(error);
+ db = osinfo_loader_get_db(loader);
+
+ /* Matching against an "all" architecture" */
+ tree = create_tree("x86_64");
+ os = osinfo_db_guess_os_from_tree(db, tree, &matched_tree);
+ g_assert_nonnull(os);
+ g_assert_nonnull(matched_tree);
+ g_assert_cmpstr(osinfo_tree_get_architecture(matched_tree), ==, "all");
+ g_object_unref(tree);
+ matched_tree = NULL;
+
+ /* Matching against a known architecture, which has to have precendence */
+ tree = create_tree("i686");
+ os = osinfo_db_guess_os_from_tree(db, tree, &matched_tree);
+ g_assert_nonnull(os);
+ g_assert_nonnull(matched_tree);
+ g_assert_cmpstr(osinfo_tree_get_architecture(matched_tree), ==, "i686");
+
+ g_object_unref(tree);
+ g_object_unref(loader);
+}
+
int
main(int argc, char *argv[])
@@ -465,6 +516,7 @@ main(int argc, char *argv[])
g_test_add_func("/db/prop_os", test_prop_os);
g_test_add_func("/db/rel_os", test_rel_os);
g_test_add_func("/db/identify_media", test_identify_media);
+ g_test_add_func("/db/guess_os_from_tree", test_guess_os_from_tree);
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
@@ -480,6 +532,7 @@ main(int argc, char *argv[])
osinfo_loader_get_type();
osinfo_install_script_get_type();
osinfo_install_scriptlist_get_type();
+ osinfo_tree_get_type();
return g_test_run();
}
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:12 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 6/8] db: Consider the media arch
when guess an OS from media
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-7-fidencio@redhat.com>
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index ff731ed..c7963ec 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -545,6 +545,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
OsinfoOs *ret = NULL;
GList *oss = NULL;
GList *os_iter;
+ const gchar *media_arch;
const gchar *media_volume;
const gchar *media_system;
const gchar *media_publisher;
@@ -554,6 +555,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
g_return_val_if_fail(media != NULL, NULL);
+ media_arch = osinfo_media_get_architecture(media);
media_volume = osinfo_media_get_volume_id(media);
media_system = osinfo_media_get_system_id(media);
media_publisher = osinfo_media_get_publisher_id(media);
@@ -571,6 +573,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
for (media_iter = medias; media_iter; media_iter = media_iter->next) {
OsinfoMedia *os_media = OSINFO_MEDIA(media_iter->data);
+ const gchar *os_arch = osinfo_media_get_architecture(os_media);
const gchar *os_volume = osinfo_media_get_volume_id(os_media);
const gchar *os_system = osinfo_media_get_system_id(os_media);
const gchar *os_publisher = osinfo_media_get_publisher_id(os_media);
@@ -587,7 +590,8 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
if (os_vol_size <= 0)
os_vol_size = media_vol_size;
- if (match_regex(os_volume, media_volume) &&
+ if (match_regex(os_arch, media_arch) &&
+ match_regex(os_volume, media_volume) &&
match_regex(os_application, media_application) &&
match_regex(os_system, media_system) &&
match_regex(os_publisher, media_publisher) &&
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:13 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:13 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 7/8] db: Deal with "all" media
architecture
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-8-fidencio@redhat.com>
Medias with "all" architecture are used as a fallback when guessing an OS
from a media.
Knowing that, any entry with "all" architecture should not be considered
when first comparing the medias, thus those are skipped and, later on,
if no match has been found, those are used.
https://gitlab.com/libosinfo/libosinfo/issues/20
Signed-off-by: Fabiano Fid?ncio
---
osinfo/osinfo_db.c | 57 +++++++++++++++++++++++++++++++++-------------
1 file changed, 41 insertions(+), 16 deletions(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index c7963ec..438d81b 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -537,13 +537,12 @@ static gint media_volume_compare(gconstpointer a, gconstpointer b)
return 1;
}
-static OsinfoOs *
-osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
- OsinfoMedia *media,
- OsinfoMedia **matched_media)
+static gboolean compare_media(OsinfoMedia *media,
+ GList *oss,
+ OsinfoOs **ret_os,
+ OsinfoMedia **matched,
+ GList **fallback_oss)
{
- OsinfoOs *ret = NULL;
- GList *oss = NULL;
GList *os_iter;
const gchar *media_arch;
const gchar *media_volume;
@@ -552,9 +551,6 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
const gchar *media_application;
gint64 media_vol_size;
- g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
- g_return_val_if_fail(media != NULL, NULL);
-
media_arch = osinfo_media_get_architecture(media);
media_volume = osinfo_media_get_volume_id(media);
media_system = osinfo_media_get_system_id(media);
@@ -562,7 +558,6 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
media_application = osinfo_media_get_application_id(media);
media_vol_size = osinfo_media_get_volume_size(media);
- oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses));
for (os_iter = oss; os_iter; os_iter = os_iter->next) {
OsinfoOs *os = OSINFO_OS(os_iter->data);
OsinfoMediaList *media_list = osinfo_os_get_media_list(os);
@@ -587,18 +582,25 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
os_vol_size <= 0)
continue;
+ if (fallback_oss != NULL) {
+ if (g_str_equal(os_arch, "all")) {
+ *fallback_oss = g_list_prepend(*fallback_oss, os);
+ continue;
+ }
+ }
+
if (os_vol_size <= 0)
os_vol_size = media_vol_size;
- if (match_regex(os_arch, media_arch) &&
+ if ((g_str_equal(os_arch, "all") || match_regex(os_arch, media_arch)) &&
match_regex(os_volume, media_volume) &&
match_regex(os_application, media_application) &&
match_regex(os_system, media_system) &&
match_regex(os_publisher, media_publisher) &&
os_vol_size == media_vol_size) {
- ret = os;
- if (matched_media != NULL)
- *matched_media = os_media;
+ *ret_os = os;
+ if (matched != NULL)
+ *matched = os_media;
break;
}
}
@@ -606,11 +608,34 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
g_list_free(medias);
g_object_unref(media_list);
- if (ret)
- break;
+ if (*ret_os)
+ return TRUE;
}
+ return FALSE;
+}
+
+static OsinfoOs *
+osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
+ OsinfoMedia *media,
+ OsinfoMedia **matched_media)
+{
+ OsinfoOs *ret = NULL;
+ GList *oss = NULL;
+ GList *fallback_oss = NULL;
+
+ g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
+ g_return_val_if_fail(media != NULL, NULL);
+
+ oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses));
+ if (compare_media(media, oss, &ret, matched_media, &fallback_oss))
+ goto end;
+
+ compare_media(media, fallback_oss, &ret, matched_media, NULL);
+
+ end:
g_list_free(oss);
+ g_list_free(fallback_oss);
return ret;
}
--
2.20.1
From fidencio at redhat.com Thu Mar 28 21:26:14 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 22:26:14 +0100
Subject: [Libosinfo] [libosinfo PATCH v2 8/8] test-db: Add test to cover
identifying a media with "unknown" arch
In-Reply-To: <20190328212614.25589-1-fidencio@redhat.com>
References: <20190328212614.25589-1-fidencio@redhat.com>
Message-ID: <20190328212614.25589-9-fidencio@redhat.com>
Signed-off-by: Fabiano Fid?ncio
---
.../dbdata/os/libosinfo.org/test-db-media.xml | 14 +++++++++++
tests/test-db.c | 25 +++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/tests/dbdata/os/libosinfo.org/test-db-media.xml b/tests/dbdata/os/libosinfo.org/test-db-media.xml
index 04badfd..89de6a4 100644
--- a/tests/dbdata/os/libosinfo.org/test-db-media.xml
+++ b/tests/dbdata/os/libosinfo.org/test-db-media.xml
@@ -25,6 +25,20 @@
+
+
+ bootimg
+ LINUX
+
+
+
+
+
+ bootimg
+ LINUX
+
+
+
diff --git a/tests/test-db.c b/tests/test-db.c
index d5e8b49..9790140 100644
--- a/tests/test-db.c
+++ b/tests/test-db.c
@@ -446,6 +446,30 @@ test_identify_media(void)
g_assert_false(osinfo_db_identify_media(db, media));
g_object_unref(media);
+ /* Matching against an "unknown" architecture */
+ media = osinfo_media_new("foo", "x86_64");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_VOLUME_ID,
+ "bootimg");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_SYSTEM_ID,
+ "LINUX");
+ g_assert_true(osinfo_db_identify_media(db, media));
+ g_assert_cmpstr(osinfo_media_get_architecture(media), ==, "all");
+ g_object_unref(media);
+
+ /* Matching against a known architecture, which has to have precendence */
+ media = osinfo_media_new("foo", "i686");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_VOLUME_ID,
+ "bootimg");
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_SYSTEM_ID,
+ "LINUX");
+ g_assert_true(osinfo_db_identify_media(db, media));
+ g_assert_cmpstr(osinfo_media_get_architecture(media), ==, "i686");
+ g_object_unref(media);
+
g_object_unref(loader);
}
@@ -533,6 +557,7 @@ main(int argc, char *argv[])
osinfo_install_script_get_type();
osinfo_install_scriptlist_get_type();
osinfo_tree_get_type();
+ osinfo_media_get_type();
return g_test_run();
}
--
2.20.1
From fabiano at fidencio.org Thu Mar 28 22:00:55 2019
From: fabiano at fidencio.org (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 28 Mar 2019 23:00:55 +0100
Subject: [Libosinfo] [libosinfo PATCH] spec: Add build_timestamp to the
Release
In-Reply-To: <20190307092719.8564-1-fidencio@redhat.com>
References: <20190307092719.8564-1-fidencio@redhat.com>
Message-ID:
On Thu, Mar 7, 2019 at 10:27 AM Fabiano Fid?ncio wrote:
>
> The upstream spec file is used for anything else than local builds
> and/or as a reference for the downstream spec file.
>
> Knowing that, let's add a build_timestamp to its Release tag so we could
> generate builds (either via ./prepare-release.sh or, possibly, taking
> advantage of Copr infrastructure) for the project that can be easily
> updated every new build and also doesn't clash with the Fedora official
> builds*. This change may be really helpful for testing management apps
> code depending on to-be-released libosinfo code.
>
> *: The release number was changed from 1 to 0 as official Fedora releases
> will always use 1. Meaning that users wouldn't face any issue upgrading
> from a custom generated build to a Fedora official one.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> If this patch gets accepted, I'll propose the same changes for
> osinfo-db-tools.
>
> I'm not totally sure whether I can easily trigger a new Copr build based
> on commit changes as it'd require a .spec and not a .spec.in, but having
> this patch in would already help people doing local builds for testing
> purposes.
> ---
> libosinfo.spec.in | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index fd7e55c..f75e31d 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -1,9 +1,11 @@
> # -*- rpm-spec -*-
>
> +%define build_timestamp %(date +"%Y%m%d%H%M%s")
> +
> Summary: A library for managing OS information for virtualization
> Name: libosinfo
> Version: @VERSION@
> -Release: 1%{?dist}
> +Release: 0.%{?build_timestamp}%{?dist}
> License: LGPLv2+
> Group: Development/Libraries
> Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
ping?
--
Fabiano Fid?ncio
From fidencio at redhat.com Fri Mar 29 09:14:48 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Fri, 29 Mar 2019 10:14:48 +0100
Subject: [Libosinfo] [PATCH osinfo-db 2/6] Add
scripts/osinfo-db-add-iso.py
In-Reply-To: <581da944dd40fabe4517ee4880d2cf91a44644bf.1553735163.git.crobinso@redhat.com>
References:
<581da944dd40fabe4517ee4880d2cf91a44644bf.1553735163.git.crobinso@redhat.com>
Message-ID:
On Wed, 2019-03-27 at 21:08 -0400, Cole Robinson wrote:
> This script simplifies the process of adding new iso data to the
> test suite and optionally filling in a block for the .
> Call it like
>
> ./scripts/osinfo-db-add-iso.py SHORTID [--arch ARCH] ISOPATH
>
> It will print a block template to stdout, and generate a
> correctly named data file in tests/isodata/
>
> Signed-off-by: Cole Robinson
> ---
> scripts/osinfo-db-add-iso.py | 113
> +++++++++++++++++++++++++++++++++++
> 1 file changed, 113 insertions(+)
> create mode 100755 scripts/osinfo-db-add-iso.py
>
> diff --git a/scripts/osinfo-db-add-iso.py b/scripts/osinfo-db-add-
> iso.py
> new file mode 100755
> index 0000000..8a16859
> --- /dev/null
> +++ b/scripts/osinfo-db-add-iso.py
> @@ -0,0 +1,113 @@
> +#!/usr/bin/env python3
> +
> +import argparse
> +import distutils.spawn
> +import os
> +import sys
> +import tempfile
> +import time
> +
> +
> +topdir = os.path.realpath(os.path.join(os.path.dirname(__file__),
> ".."))
> +datadir = os.path.join(topdir, "data")
> +sys.path.insert(0, topdir)
> +os.environ["INTERNAL_OSINFO_DB_DATA_DIR"] = datadir
> +
> +import tests.isodata
> +import tests.util
> +
> +
> +def fail(msg):
> + print(msg)
> + sys.exit(1)
> +
> +
> +##############################
> +# main() and option handling #
> +##############################
> +
> +def _parse_args():
> + desc = ("Helper script for adding iso test data to the test "
> + "suite, and matching data to the DB")
> + parser = argparse.ArgumentParser(description=desc)
> +
> + parser.add_argument("shortid", help="Which short-id "
> + "the ISO is media for")
> + parser.add_argument("iso", help="The path to the ISO media")
> + parser.add_argument("--arch", default="x86_64",
> + help="The OS architecture the media is for.
> default=x86_64")
> +
> + options = parser.parse_args()
> + return options
> +
> +
> +def _main():
> + """
> + This is a template for new command line programs. Copy and edit
> it!
> + """
> + options = _parse_args()
> +
> + iso = os.path.realpath(os.path.abspath(options.iso))
> + isoinfobin = distutils.spawn.find_executable("isoinfo")
> + if not os.path.exists(iso):
> + fail("iso does not exist: %s" % iso)
> + if not isoinfobin:
> + fail("isoinfo is not installed")
> +
> + osxml = None
> + for o in tests.util.DataFiles.oses():
> + if o.shortid == options.shortid:
> + osxml = o
> + break
> + if not osxml:
> + fail("Did not find any os shortid=%s" % options.shortid)
> + return
If I understand correctly, it'd simply abort in case I try to add a new
version of an existing OS, right? For instance, the script would bail
when trying to add the first fedora30 instance.
It's something we can definitely improve in the feature.
> +
> + destdir = os.path.join(topdir, "tests", "isodata", osxml.distro,
> + options.shortid)
> + destpath = os.path.join(destdir, os.path.basename(iso) + ".txt")
> +
> + tmp = tempfile.NamedTemporaryFile()
> + ret = os.system("isoinfo -d -i %s > %s" % (iso, tmp.name))
> + if ret != 0:
> + fail("Command failed, returncode=%s" % ret)
> +
> + # parse isoinfo
> + # output an example media block
> + isodata = tests.isodata.get_isodatamedia(tmp.name)
> + print("XML to add to %s :" % osxml.filename[len(topdir) + 1:] +
> ".in")
> + print()
> + print(" " % options.arch)
> + print(" XXX")
> + print(" ")
> +
> + if isodata.volumeid:
> + print(" %s" %
> isodata.volumeid)
> + if isodata.systemid:
> + print(" %s" %
> isodata.systemid)
> + if isodata.publisherid:
> + print(" %s" %
> isodata.publisherid)
> + if isodata.applicationid:
> + print(" %s" %
> + isodata.applicationid)
> + if isodata.volumesize:
> + print(" %s" %
> isodata.volumesize)
> +
> + print(" ")
> + print(" XXX")
> + print(" XXX")
> + print(" ")
> + print()
> +
> + print("\n\nSleeping 5 seconds before writing test data to:\n%s"
> % destpath)
> + time.sleep(5)
> + if not os.path.exists(destdir):
> + os.system("mkdir -p %s" % destdir)
> + os.system("cp %s %s" % (tmp.name, destpath))
> + print("Done.")
> +
> + return 0
> +
> +
> +if __name__ == '__main__':
> + sys.exit(_main())
From fidencio at redhat.com Fri Mar 29 09:15:37 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Fri, 29 Mar 2019 10:15:37 +0100
Subject: [Libosinfo] [PATCH osinfo-db 2/6] Add
scripts/osinfo-db-add-iso.py
In-Reply-To:
References:
<581da944dd40fabe4517ee4880d2cf91a44644bf.1553735163.git.crobinso@redhat.com>
Message-ID:
On Fri, 2019-03-29 at 10:14 +0100, Fabiano Fid?ncio wrote:
> On Wed, 2019-03-27 at 21:08 -0400, Cole Robinson wrote:
> > This script simplifies the process of adding new iso data to the
> > test suite and optionally filling in a block for the .
> > Call it like
> >
> > ./scripts/osinfo-db-add-iso.py SHORTID [--arch ARCH] ISOPATH
> >
> > It will print a block template to stdout, and generate a
> > correctly named data file in tests/isodata/
> >
> > Signed-off-by: Cole Robinson
> > ---
> > scripts/osinfo-db-add-iso.py | 113
> > +++++++++++++++++++++++++++++++++++
> > 1 file changed, 113 insertions(+)
> > create mode 100755 scripts/osinfo-db-add-iso.py
> >
> > diff --git a/scripts/osinfo-db-add-iso.py b/scripts/osinfo-db-add-
> > iso.py
> > new file mode 100755
> > index 0000000..8a16859
> > --- /dev/null
> > +++ b/scripts/osinfo-db-add-iso.py
> > @@ -0,0 +1,113 @@
> > +#!/usr/bin/env python3
> > +
> > +import argparse
> > +import distutils.spawn
> > +import os
> > +import sys
> > +import tempfile
> > +import time
> > +
> > +
> > +topdir = os.path.realpath(os.path.join(os.path.dirname(__file__),
> > ".."))
> > +datadir = os.path.join(topdir, "data")
> > +sys.path.insert(0, topdir)
> > +os.environ["INTERNAL_OSINFO_DB_DATA_DIR"] = datadir
> > +
> > +import tests.isodata
> > +import tests.util
> > +
> > +
> > +def fail(msg):
> > + print(msg)
> > + sys.exit(1)
> > +
> > +
> > +##############################
> > +# main() and option handling #
> > +##############################
> > +
> > +def _parse_args():
> > + desc = ("Helper script for adding iso test data to the test "
> > + "suite, and matching data to the DB")
> > + parser = argparse.ArgumentParser(description=desc)
> > +
> > + parser.add_argument("shortid", help="Which short-id "
> > + "the ISO is media for")
> > + parser.add_argument("iso", help="The path to the ISO media")
> > + parser.add_argument("--arch", default="x86_64",
> > + help="The OS architecture the media is for.
> > default=x86_64")
> > +
> > + options = parser.parse_args()
> > + return options
> > +
> > +
> > +def _main():
> > + """
> > + This is a template for new command line programs. Copy and
> > edit
> > it!
> > + """
> > + options = _parse_args()
> > +
> > + iso = os.path.realpath(os.path.abspath(options.iso))
> > + isoinfobin = distutils.spawn.find_executable("isoinfo")
> > + if not os.path.exists(iso):
> > + fail("iso does not exist: %s" % iso)
> > + if not isoinfobin:
> > + fail("isoinfo is not installed")
> > +
> > + osxml = None
> > + for o in tests.util.DataFiles.oses():
> > + if o.shortid == options.shortid:
> > + osxml = o
> > + break
> > + if not osxml:
> > + fail("Did not find any os shortid=%s" % options.shortid)
> > + return
>
> If I understand correctly, it'd simply abort in case I try to add a
> new
> version of an existing OS, right? For instance, the script would bail
> when trying to add the first fedora30 instance.
>
> It's something we can definitely improve in the feature.
* future!
[snip]
From fidencio at redhat.com Fri Mar 29 09:22:56 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Fri, 29 Mar 2019 10:22:56 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/6] Add
scripts/osinfo-db-add-iso.py
In-Reply-To:
References:
Message-ID: <0f5b0148fe4ec2992b6cea5cf207b132b71fa5d3.camel@redhat.com>
On Wed, 2019-03-27 at 21:08 -0400, Cole Robinson wrote:
> This series adds scripts/osinfo-db-add-iso.py, which simplifies the
> process of adding new iso data to the test suite and optionally
> filling
> in a block for the . Call it like:
>
> ./scripts/osinfo-db-add-iso.py SHORTID [--arch ARCH] ISOPATH
>
> It will print a block template to stdout, and generate a
> correctly named data file in tests/isodata/
>
> Patch #1 renames some dirs in tests/isodata/* to consistently be
> named after the value.
>
> Patch #2 adds the script
>
> Remaining patches tweak debian media data detection and add some more
> test cases... not strictly related to the first two patches but they
> were my test cases to get this working
Cole, I've left a comment for you in the second patch.
For the whole series:
Reviewed-by: Fabiano Fid?ncio
And it'll be push shortly after I finished a few other reviews.
Best Regards,
--
Fabiano Fid?ncio
From fidencio at redhat.com Fri Mar 29 09:31:21 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Fri, 29 Mar 2019 10:31:21 +0100
Subject: [Libosinfo] [PATCH osinfo-db 0/3] tests: push Makefile bits to
conftest.py
In-Reply-To:
References:
Message-ID:
On Thu, 2019-03-28 at 16:55 -0400, Cole Robinson wrote:
> This series pushes the recent Makefile 'make check' bits into
> tests/conftest.py init code. This means there is now no difference
> between invoking pytest directly and calling 'make check'.
>
> Tested on freebsd12.0 (for the locale handling) and debian9 (for
> the log-level=info handling)
Reviewed-by: Fabiano Fid?ncio
Best Regards,
--
Fabiano Fid?ncio
From berrange at redhat.com Fri Mar 29 09:49:49 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 29 Mar 2019 09:49:49 +0000
Subject: [Libosinfo] [PATCH osinfo-db 3/3] tests: conftest: set locale
in test code
In-Reply-To: <445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
References:
<445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
Message-ID: <20190329094949.GC15132@redhat.com>
On Thu, Mar 28, 2019 at 04:55:34PM -0400, Cole Robinson wrote:
> This fixes the locale setup with direct pytest-3 invocations
>
> Signed-off-by: Cole Robinson
> ---
> Makefile | 2 +-
> tests/conftest.py | 4 ++++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index b3e06d5..4f6f8d4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -121,4 +121,4 @@ update-po:
> done
>
> check: $(DATA_FILES) $(SCHEMA_FILES)
> - LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest
> + $(PYTHON) -m pytest
> diff --git a/tests/conftest.py b/tests/conftest.py
> index 4a16a04..ade36c5 100644
> --- a/tests/conftest.py
> +++ b/tests/conftest.py
> @@ -1,6 +1,7 @@
> # This work is licensed under the GNU GPLv2 or later.
> # See the COPYING file in the top-level directory.
>
> +import locale
> import os
>
>
> @@ -16,6 +17,9 @@ def pytest_configure(config):
> os.environ[key] = os.path.realpath(os.path.join(
> os.path.dirname(__file__), "..", "data"))
>
> + # Needed for test reproducibility on freebsd
This isn't a freebsd problem. It will hit any user who is not using a
UTF-8 locale.
> + locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
> +
> # Default to --log-level=info if not otherwise specified
> if (hasattr(config.option, "log_level") and
> config.option.log_level is None):
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From berrange at redhat.com Fri Mar 29 09:52:00 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 29 Mar 2019 09:52:00 +0000
Subject: [Libosinfo] [PATCH osinfo-db 3/3] tests: conftest: set locale
in test code
In-Reply-To: <445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
References:
<445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
Message-ID: <20190329095200.GD15132@redhat.com>
On Thu, Mar 28, 2019 at 04:55:34PM -0400, Cole Robinson wrote:
> This fixes the locale setup with direct pytest-3 invocations
>
> Signed-off-by: Cole Robinson
> ---
> Makefile | 2 +-
> tests/conftest.py | 4 ++++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index b3e06d5..4f6f8d4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -121,4 +121,4 @@ update-po:
> done
>
> check: $(DATA_FILES) $(SCHEMA_FILES)
> - LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest
> + $(PYTHON) -m pytest
> diff --git a/tests/conftest.py b/tests/conftest.py
> index 4a16a04..ade36c5 100644
> --- a/tests/conftest.py
> +++ b/tests/conftest.py
> @@ -1,6 +1,7 @@
> # This work is licensed under the GNU GPLv2 or later.
> # See the COPYING file in the top-level directory.
>
> +import locale
> import os
>
>
> @@ -16,6 +17,9 @@ def pytest_configure(config):
> os.environ[key] = os.path.realpath(os.path.join(
> os.path.dirname(__file__), "..", "data"))
>
> + # Needed for test reproducibility on freebsd
> + locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
This doesn't actually do the same as the makefile code. This still uses
the user's own locale for everything that isn't LC_CTYPE. The make code
explicitly forced C locale to ensure reproducable environment that does
not vary per user locale.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From fidencio at redhat.com Fri Mar 29 10:56:28 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 11:56:28 +0100
Subject: [Libosinfo] [osinfo-db PATCH] test: conftest: Set LC_ALL
Message-ID: <20190329105628.4194-1-fidencio@redhat.com>
Based on Dan's comment: "This doesn't actually do the same as the
makefile code. This still uses the user's own locale for everything that
isn't LC_CTYPE. The make code explicitly forced C locale to ensure
reproducable environment that does not vary per user locale.", let's
force the C locale.
Also based on Dan's comment: "This isn't a freebsd problem. It will hit
any user who is not using a UTF-8 locale.", let's adjust the comment
explaining why we need to have LC_ALL and LC_CTYPE set.
Signed-off-by: Fabiano Fid?ncio
---
tests/conftest.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index ade36c5..a6cb20a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -17,7 +17,8 @@ def pytest_configure(config):
os.environ[key] = os.path.realpath(os.path.join(
os.path.dirname(__file__), "..", "data"))
- # Needed for test reproducibility on freebsd
+ # Needed for test reproducibility on any system not using a UTF-8 locale
+ locale.setlocale(locale.LC_ALL, 'C')
locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
# Default to --log-level=info if not otherwise specified
--
2.20.1
From crobinso at redhat.com Fri Mar 29 15:45:57 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 29 Mar 2019 11:45:57 -0400
Subject: [Libosinfo] [PATCH osinfo-db 2/6] Add
scripts/osinfo-db-add-iso.py
In-Reply-To:
References:
<581da944dd40fabe4517ee4880d2cf91a44644bf.1553735163.git.crobinso@redhat.com>
Message-ID: <44463b60-63a0-c4f5-98c5-e978fa691b04@redhat.com>
On 3/29/19 5:14 AM, Fabiano Fid?ncio wrote:
> On Wed, 2019-03-27 at 21:08 -0400, Cole Robinson wrote:
>> This script simplifies the process of adding new iso data to the
>> test suite and optionally filling in a block for the .
>> Call it like
>>
>> ./scripts/osinfo-db-add-iso.py SHORTID [--arch ARCH] ISOPATH
>>
>> It will print a block template to stdout, and generate a
>> correctly named data file in tests/isodata/
>>
>> Signed-off-by: Cole Robinson
>> ---
>> scripts/osinfo-db-add-iso.py | 113
>> +++++++++++++++++++++++++++++++++++
>> 1 file changed, 113 insertions(+)
>> create mode 100755 scripts/osinfo-db-add-iso.py
>>
>> diff --git a/scripts/osinfo-db-add-iso.py b/scripts/osinfo-db-add-
>> iso.py
>> new file mode 100755
>> index 0000000..8a16859
>> --- /dev/null
>> +++ b/scripts/osinfo-db-add-iso.py
>> @@ -0,0 +1,113 @@
>> +#!/usr/bin/env python3
>> +
>> +import argparse
>> +import distutils.spawn
>> +import os
>> +import sys
>> +import tempfile
>> +import time
>> +
>> +
>> +topdir = os.path.realpath(os.path.join(os.path.dirname(__file__),
>> ".."))
>> +datadir = os.path.join(topdir, "data")
>> +sys.path.insert(0, topdir)
>> +os.environ["INTERNAL_OSINFO_DB_DATA_DIR"] = datadir
>> +
>> +import tests.isodata
>> +import tests.util
>> +
>> +
>> +def fail(msg):
>> + print(msg)
>> + sys.exit(1)
>> +
>> +
>> +##############################
>> +# main() and option handling #
>> +##############################
>> +
>> +def _parse_args():
>> + desc = ("Helper script for adding iso test data to the test "
>> + "suite, and matching data to the DB")
>> + parser = argparse.ArgumentParser(description=desc)
>> +
>> + parser.add_argument("shortid", help="Which short-id "
>> + "the ISO is media for")
>> + parser.add_argument("iso", help="The path to the ISO media")
>> + parser.add_argument("--arch", default="x86_64",
>> + help="The OS architecture the media is for.
>> default=x86_64")
>> +
>> + options = parser.parse_args()
>> + return options
>> +
>> +
>> +def _main():
>> + """
>> + This is a template for new command line programs. Copy and edit
>> it!
>> + """
>> + options = _parse_args()
>> +
>> + iso = os.path.realpath(os.path.abspath(options.iso))
>> + isoinfobin = distutils.spawn.find_executable("isoinfo")
>> + if not os.path.exists(iso):
>> + fail("iso does not exist: %s" % iso)
>> + if not isoinfobin:
>> + fail("isoinfo is not installed")
>> +
>> + osxml = None
>> + for o in tests.util.DataFiles.oses():
>> + if o.shortid == options.shortid:
>> + osxml = o
>> + break
>> + if not osxml:
>> + fail("Did not find any os shortid=%s" % options.shortid)
>> + return
>
> If I understand correctly, it'd simply abort in case I try to add a new
> version of an existing OS, right? For instance, the script would bail
> when trying to add the first fedora30 instance.
>
> It's something we can definitely improve in the feature.
>
Yes if we tried to do ./scripts/osinfo-db-add-iso.py fedora30 $ISOPATH,
it will hit this error as fedora30 doesn't exist yet. I think this is
good to reject accidental typos.
I don't quite follow why we'd want to add isodata before the OS has been
added to the DB though, seems simple enough to just swap the patch
ordering. If we want to allow what you suggest we would also need to add
a --distro option since we won't be able to pull it out of an osxml instance
Thanks,
Cole
From crobinso at redhat.com Fri Mar 29 15:48:50 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 29 Mar 2019 11:48:50 -0400
Subject: [Libosinfo] [PATCH osinfo-db 3/3] tests: conftest: set locale
in test code
In-Reply-To: <20190329095200.GD15132@redhat.com>
References:
<445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
<20190329095200.GD15132@redhat.com>
Message-ID: <8378a520-1cb5-6493-3d70-c1d361528ec8@redhat.com>
On 3/29/19 5:52 AM, Daniel P. Berrang? wrote:
> On Thu, Mar 28, 2019 at 04:55:34PM -0400, Cole Robinson wrote:
>> This fixes the locale setup with direct pytest-3 invocations
>>
>> Signed-off-by: Cole Robinson
>> ---
>> Makefile | 2 +-
>> tests/conftest.py | 4 ++++
>> 2 files changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/Makefile b/Makefile
>> index b3e06d5..4f6f8d4 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -121,4 +121,4 @@ update-po:
>> done
>>
>> check: $(DATA_FILES) $(SCHEMA_FILES)
>> - LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest
>> + $(PYTHON) -m pytest
>> diff --git a/tests/conftest.py b/tests/conftest.py
>> index 4a16a04..ade36c5 100644
>> --- a/tests/conftest.py
>> +++ b/tests/conftest.py
>> @@ -1,6 +1,7 @@
>> # This work is licensed under the GNU GPLv2 or later.
>> # See the COPYING file in the top-level directory.
>>
>> +import locale
>> import os
>>
>>
>> @@ -16,6 +17,9 @@ def pytest_configure(config):
>> os.environ[key] = os.path.realpath(os.path.join(
>> os.path.dirname(__file__), "..", "data"))
>>
>> + # Needed for test reproducibility on freebsd
>> + locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
>
> This doesn't actually do the same as the makefile code. This still uses
> the user's own locale for everything that isn't LC_CTYPE. The make code
> explicitly forced C locale to ensure reproducable environment that does
> not vary per user locale.
>
Okay I think prepending locale.setlocale(locale.LC_ALL, 'C') will
accomplish the same though I don't really know the details of how it
propagates through the stack. Does that sound okay + fixing the comment?
Fabiano pushed the patch so I can send a follow up
The main goal is to avoid the need to run with an environment variable
so direct pytest invocation is as valid as 'make check'. The former
gives much more flexibility
- Cole
From crobinso at redhat.com Fri Mar 29 15:49:59 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 29 Mar 2019 11:49:59 -0400
Subject: [Libosinfo] [PATCH osinfo-db 3/3] tests: conftest: set locale
in test code
In-Reply-To: <8378a520-1cb5-6493-3d70-c1d361528ec8@redhat.com>
References:
<445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
<20190329095200.GD15132@redhat.com>
<8378a520-1cb5-6493-3d70-c1d361528ec8@redhat.com>
Message-ID: <95b0a1d8-1db8-429a-7f1f-d0cca0817f5d@redhat.com>
On 3/29/19 11:48 AM, Cole Robinson wrote:
> On 3/29/19 5:52 AM, Daniel P. Berrang? wrote:
>> On Thu, Mar 28, 2019 at 04:55:34PM -0400, Cole Robinson wrote:
>>> This fixes the locale setup with direct pytest-3 invocations
>>>
>>> Signed-off-by: Cole Robinson
>>> ---
>>> Makefile | 2 +-
>>> tests/conftest.py | 4 ++++
>>> 2 files changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index b3e06d5..4f6f8d4 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -121,4 +121,4 @@ update-po:
>>> done
>>>
>>> check: $(DATA_FILES) $(SCHEMA_FILES)
>>> - LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest
>>> + $(PYTHON) -m pytest
>>> diff --git a/tests/conftest.py b/tests/conftest.py
>>> index 4a16a04..ade36c5 100644
>>> --- a/tests/conftest.py
>>> +++ b/tests/conftest.py
>>> @@ -1,6 +1,7 @@
>>> # This work is licensed under the GNU GPLv2 or later.
>>> # See the COPYING file in the top-level directory.
>>>
>>> +import locale
>>> import os
>>>
>>>
>>> @@ -16,6 +17,9 @@ def pytest_configure(config):
>>> os.environ[key] = os.path.realpath(os.path.join(
>>> os.path.dirname(__file__), "..", "data"))
>>>
>>> + # Needed for test reproducibility on freebsd
>>> + locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
>>
>> This doesn't actually do the same as the makefile code. This still uses
>> the user's own locale for everything that isn't LC_CTYPE. The make code
>> explicitly forced C locale to ensure reproducable environment that does
>> not vary per user locale.
>>
>
> Okay I think prepending locale.setlocale(locale.LC_ALL, 'C') will
> accomplish the same though I don't really know the details of how it
> propagates through the stack. Does that sound okay + fixing the comment?
> Fabiano pushed the patch so I can send a follow up
>
> The main goal is to avoid the need to run with an environment variable
> so direct pytest invocation is as valid as 'make check'. The former
> gives much more flexibility
>
Nevermind I should have checked my libosinfo folder, fabiano sent that
exact followup
- Cole
From crobinso at redhat.com Fri Mar 29 15:51:01 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 29 Mar 2019 11:51:01 -0400
Subject: [Libosinfo] [osinfo-db PATCH] test: conftest: Set LC_ALL
In-Reply-To: <20190329105628.4194-1-fidencio@redhat.com>
References: <20190329105628.4194-1-fidencio@redhat.com>
Message-ID:
On 3/29/19 6:56 AM, Fabiano Fid?ncio wrote:
> Based on Dan's comment: "This doesn't actually do the same as the
> makefile code. This still uses the user's own locale for everything that
> isn't LC_CTYPE. The make code explicitly forced C locale to ensure
> reproducable environment that does not vary per user locale.", let's
> force the C locale.
>
> Also based on Dan's comment: "This isn't a freebsd problem. It will hit
> any user who is not using a UTF-8 locale.", let's adjust the comment
> explaining why we need to have LC_ALL and LC_CTYPE set.
>
> Signed-off-by: Fabiano Fid?ncio
> ---
> tests/conftest.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/conftest.py b/tests/conftest.py
> index ade36c5..a6cb20a 100644
> --- a/tests/conftest.py
> +++ b/tests/conftest.py
> @@ -17,7 +17,8 @@ def pytest_configure(config):
> os.environ[key] = os.path.realpath(os.path.join(
> os.path.dirname(__file__), "..", "data"))
>
> - # Needed for test reproducibility on freebsd
> + # Needed for test reproducibility on any system not using a UTF-8 locale
> + locale.setlocale(locale.LC_ALL, 'C')
> locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
>
> # Default to --log-level=info if not otherwise specified
>
Yeah that's what I came up with too. But I don't understand all the
issues at play so I'll let Dan give the review, CCd
Thanks,
Cole
From crobinso at redhat.com Fri Mar 29 15:56:58 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 29 Mar 2019 11:56:58 -0400
Subject: [Libosinfo] [libosinfo PATCH] spec: Add build_timestamp to the
Release
In-Reply-To:
References: <20190307092719.8564-1-fidencio@redhat.com>
Message-ID: <63135eaf-57f6-6bf6-93bd-9861c55f3ac2@redhat.com>
On 3/28/19 6:00 PM, Fabiano Fid?ncio wrote:
> On Thu, Mar 7, 2019 at 10:27 AM Fabiano Fid?ncio wrote:
>>
>> The upstream spec file is used for anything else than local builds
>> and/or as a reference for the downstream spec file.
>>
>> Knowing that, let's add a build_timestamp to its Release tag so we could
>> generate builds (either via ./prepare-release.sh or, possibly, taking
>> advantage of Copr infrastructure) for the project that can be easily
>> updated every new build and also doesn't clash with the Fedora official
>> builds*. This change may be really helpful for testing management apps
>> code depending on to-be-released libosinfo code.
>>
>> *: The release number was changed from 1 to 0 as official Fedora releases
>> will always use 1. Meaning that users wouldn't face any issue upgrading
>> from a custom generated build to a Fedora official one.
>>
>> Signed-off-by: Fabiano Fid?ncio
>> ---
>> If this patch gets accepted, I'll propose the same changes for
>> osinfo-db-tools.
>>
>> I'm not totally sure whether I can easily trigger a new Copr build based
>> on commit changes as it'd require a .spec and not a .spec.in, but having
>> this patch in would already help people doing local builds for testing
>> purposes.
>> ---
>> libosinfo.spec.in | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
>> index fd7e55c..f75e31d 100644
>> --- a/libosinfo.spec.in
>> +++ b/libosinfo.spec.in
>> @@ -1,9 +1,11 @@
>> # -*- rpm-spec -*-
>>
>> +%define build_timestamp %(date +"%Y%m%d%H%M%s")
>> +
>> Summary: A library for managing OS information for virtualization
>> Name: libosinfo
>> Version: @VERSION@
>> -Release: 1%{?dist}
>> +Release: 0.%{?build_timestamp}%{?dist}
>> License: LGPLv2+
>> Group: Development/Libraries
>> Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
>> --
>> 2.20.1
>>
>> _______________________________________________
>> Libosinfo mailing list
>> Libosinfo at redhat.com
>> https://www.redhat.com/mailman/listinfo/libosinfo
>
>
> ping?
>
For virt-manager/libvirt, for maintenance reasons I like to have the git
spec match what we ship in Fedora, minus any patches and the changelog.
Adding this unconditionally to spec file makes syncing spec changes
between upstream git and Fedora/RHEL a bit harder because you will ave
to strip out the build_timestamp setup.
Maybe add a 'make rpm' target that passes in the build_timestamp value
from rpmbuild? Then you can define it in the spec file in such a way
that you don't need to make more manual edits when syncing with distros.
Does that fit your usecase?
Thanks,
Cole
From fidencio at redhat.com Fri Mar 29 15:59:33 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 16:59:33 +0100
Subject: [Libosinfo] [PATCH osinfo-db 2/6] Add
scripts/osinfo-db-add-iso.py
In-Reply-To: <44463b60-63a0-c4f5-98c5-e978fa691b04@redhat.com>
References:
<581da944dd40fabe4517ee4880d2cf91a44644bf.1553735163.git.crobinso@redhat.com>
<44463b60-63a0-c4f5-98c5-e978fa691b04@redhat.com>
Message-ID:
On Fri, Mar 29, 2019 at 4:46 PM Cole Robinson wrote:
>
> On 3/29/19 5:14 AM, Fabiano Fid?ncio wrote:
> > On Wed, 2019-03-27 at 21:08 -0400, Cole Robinson wrote:
> >> This script simplifies the process of adding new iso data to the
> >> test suite and optionally filling in a block for the .
> >> Call it like
> >>
> >> ./scripts/osinfo-db-add-iso.py SHORTID [--arch ARCH] ISOPATH
> >>
> >> It will print a block template to stdout, and generate a
> >> correctly named data file in tests/isodata/
> >>
> >> Signed-off-by: Cole Robinson
> >> ---
> >> scripts/osinfo-db-add-iso.py | 113
> >> +++++++++++++++++++++++++++++++++++
> >> 1 file changed, 113 insertions(+)
> >> create mode 100755 scripts/osinfo-db-add-iso.py
> >>
> >> diff --git a/scripts/osinfo-db-add-iso.py b/scripts/osinfo-db-add-
> >> iso.py
> >> new file mode 100755
> >> index 0000000..8a16859
> >> --- /dev/null
> >> +++ b/scripts/osinfo-db-add-iso.py
> >> @@ -0,0 +1,113 @@
> >> +#!/usr/bin/env python3
> >> +
> >> +import argparse
> >> +import distutils.spawn
> >> +import os
> >> +import sys
> >> +import tempfile
> >> +import time
> >> +
> >> +
> >> +topdir = os.path.realpath(os.path.join(os.path.dirname(__file__),
> >> ".."))
> >> +datadir = os.path.join(topdir, "data")
> >> +sys.path.insert(0, topdir)
> >> +os.environ["INTERNAL_OSINFO_DB_DATA_DIR"] = datadir
> >> +
> >> +import tests.isodata
> >> +import tests.util
> >> +
> >> +
> >> +def fail(msg):
> >> + print(msg)
> >> + sys.exit(1)
> >> +
> >> +
> >> +##############################
> >> +# main() and option handling #
> >> +##############################
> >> +
> >> +def _parse_args():
> >> + desc = ("Helper script for adding iso test data to the test "
> >> + "suite, and matching data to the DB")
> >> + parser = argparse.ArgumentParser(description=desc)
> >> +
> >> + parser.add_argument("shortid", help="Which short-id "
> >> + "the ISO is media for")
> >> + parser.add_argument("iso", help="The path to the ISO media")
> >> + parser.add_argument("--arch", default="x86_64",
> >> + help="The OS architecture the media is for.
> >> default=x86_64")
> >> +
> >> + options = parser.parse_args()
> >> + return options
> >> +
> >> +
> >> +def _main():
> >> + """
> >> + This is a template for new command line programs. Copy and edit
> >> it!
> >> + """
> >> + options = _parse_args()
> >> +
> >> + iso = os.path.realpath(os.path.abspath(options.iso))
> >> + isoinfobin = distutils.spawn.find_executable("isoinfo")
> >> + if not os.path.exists(iso):
> >> + fail("iso does not exist: %s" % iso)
> >> + if not isoinfobin:
> >> + fail("isoinfo is not installed")
> >> +
> >> + osxml = None
> >> + for o in tests.util.DataFiles.oses():
> >> + if o.shortid == options.shortid:
> >> + osxml = o
> >> + break
> >> + if not osxml:
> >> + fail("Did not find any os shortid=%s" % options.shortid)
> >> + return
> >
> > If I understand correctly, it'd simply abort in case I try to add a new
> > version of an existing OS, right? For instance, the script would bail
> > when trying to add the first fedora30 instance.
> >
> > It's something we can definitely improve in the feature.
> >
>
> Yes if we tried to do ./scripts/osinfo-db-add-iso.py fedora30 $ISOPATH,
> it will hit this error as fedora30 doesn't exist yet. I think this is
> good to reject accidental typos.
>
> I don't quite follow why we'd want to add isodata before the OS has been
> added to the DB though, seems simple enough to just swap the patch
> ordering. If we want to allow what you suggest we would also need to add
> a --distro option since we won't be able to pull it out of an osxml instance
What I had in mind was not about adding the isodata before adding the
OS, but using the isodata to add the new OS entry.
So, even before adding the fedora30 media, I'd like to run the script
and have the fedora30 media entries already done. :-)
But, anyways, that's something that can be improved in the future, in
case it makes sense.
>
> Thanks,
> Cole
From berrange at redhat.com Fri Mar 29 16:00:00 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 29 Mar 2019 16:00:00 +0000
Subject: [Libosinfo] [PATCH osinfo-db 3/3] tests: conftest: set locale
in test code
In-Reply-To: <8378a520-1cb5-6493-3d70-c1d361528ec8@redhat.com>
References:
<445f012a0bc20460b82dfcd343f6a1aa6301b25a.1553806397.git.crobinso@redhat.com>
<20190329095200.GD15132@redhat.com>
<8378a520-1cb5-6493-3d70-c1d361528ec8@redhat.com>
Message-ID: <20190329160000.GE20703@redhat.com>
On Fri, Mar 29, 2019 at 11:48:50AM -0400, Cole Robinson wrote:
> On 3/29/19 5:52 AM, Daniel P. Berrang? wrote:
> > On Thu, Mar 28, 2019 at 04:55:34PM -0400, Cole Robinson wrote:
> >> This fixes the locale setup with direct pytest-3 invocations
> >>
> >> Signed-off-by: Cole Robinson
> >> ---
> >> Makefile | 2 +-
> >> tests/conftest.py | 4 ++++
> >> 2 files changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/Makefile b/Makefile
> >> index b3e06d5..4f6f8d4 100644
> >> --- a/Makefile
> >> +++ b/Makefile
> >> @@ -121,4 +121,4 @@ update-po:
> >> done
> >>
> >> check: $(DATA_FILES) $(SCHEMA_FILES)
> >> - LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest
> >> + $(PYTHON) -m pytest
> >> diff --git a/tests/conftest.py b/tests/conftest.py
> >> index 4a16a04..ade36c5 100644
> >> --- a/tests/conftest.py
> >> +++ b/tests/conftest.py
> >> @@ -1,6 +1,7 @@
> >> # This work is licensed under the GNU GPLv2 or later.
> >> # See the COPYING file in the top-level directory.
> >>
> >> +import locale
> >> import os
> >>
> >>
> >> @@ -16,6 +17,9 @@ def pytest_configure(config):
> >> os.environ[key] = os.path.realpath(os.path.join(
> >> os.path.dirname(__file__), "..", "data"))
> >>
> >> + # Needed for test reproducibility on freebsd
> >> + locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
> >
> > This doesn't actually do the same as the makefile code. This still uses
> > the user's own locale for everything that isn't LC_CTYPE. The make code
> > explicitly forced C locale to ensure reproducable environment that does
> > not vary per user locale.
> >
>
> Okay I think prepending locale.setlocale(locale.LC_ALL, 'C') will
> accomplish the same though I don't really know the details of how it
> propagates through the stack. Does that sound okay + fixing the comment?
> Fabiano pushed the patch so I can send a follow up
Yes, I believe that would be equivalent to the make rule
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From berrange at redhat.com Fri Mar 29 16:00:41 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 29 Mar 2019 16:00:41 +0000
Subject: [Libosinfo] [osinfo-db PATCH] test: conftest: Set LC_ALL
In-Reply-To:
References: <20190329105628.4194-1-fidencio@redhat.com>
Message-ID: <20190329160041.GF20703@redhat.com>
On Fri, Mar 29, 2019 at 11:51:01AM -0400, Cole Robinson wrote:
> On 3/29/19 6:56 AM, Fabiano Fid?ncio wrote:
> > Based on Dan's comment: "This doesn't actually do the same as the
> > makefile code. This still uses the user's own locale for everything that
> > isn't LC_CTYPE. The make code explicitly forced C locale to ensure
> > reproducable environment that does not vary per user locale.", let's
> > force the C locale.
> >
> > Also based on Dan's comment: "This isn't a freebsd problem. It will hit
> > any user who is not using a UTF-8 locale.", let's adjust the comment
> > explaining why we need to have LC_ALL and LC_CTYPE set.
> >
> > Signed-off-by: Fabiano Fid?ncio
> > ---
> > tests/conftest.py | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tests/conftest.py b/tests/conftest.py
> > index ade36c5..a6cb20a 100644
> > --- a/tests/conftest.py
> > +++ b/tests/conftest.py
> > @@ -17,7 +17,8 @@ def pytest_configure(config):
> > os.environ[key] = os.path.realpath(os.path.join(
> > os.path.dirname(__file__), "..", "data"))
> >
> > - # Needed for test reproducibility on freebsd
> > + # Needed for test reproducibility on any system not using a UTF-8 locale
> > + locale.setlocale(locale.LC_ALL, 'C')
> > locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
> >
> > # Default to --log-level=info if not otherwise specified
> >
>
> Yeah that's what I came up with too. But I don't understand all the
> issues at play so I'll let Dan give the review, CCd
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From ptoscano at redhat.com Fri Mar 29 16:26:42 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Fri, 29 Mar 2019 17:26:42 +0100
Subject: [Libosinfo] [libosinfo PATCH] gitignore: remove old entries
Message-ID: <20190329162642.15629-1-ptoscano@redhat.com>
Remove patterns referring to old tests, and in general to files that do
not exist anymore.
---
.gitignore | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/.gitignore b/.gitignore
index fb80e9f..f82d734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ AUTHORS
*~
.deps
.libs
-.sc-start-sc_*
Makefile
Makefile.in
aclocal.m4
@@ -17,7 +16,6 @@ build-aux/depcomp
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
-build-aux/mkinstalldirs
build-aux/config.rpath
build-aux/test-driver
config.cache
@@ -30,8 +28,6 @@ libtool
m4
stamp-h1
tags
-tests/test-skeleton
-tests/test-skeleton.sh
osinfo/libosinfo.pc
osinfo/Libosinfo-1.0.gir
osinfo/Libosinfo-1.0.typelib
@@ -46,13 +42,11 @@ coverage/
tests/test-device
tests/test-os
tests/test-entity
-tests/test-hypervisor
tests/test-list
tests/test-db
tests/test-devicelist
tests/test-devicelinklist
tests/test-filter
-tests/test-hypervisorlist
tests/test-install-script
tests/test-image
tests/test-imagelist
@@ -60,35 +54,19 @@ tests/test-loader
tests/test-media
tests/test-productfilter
tests/test-oslist
-tests/test-os-resources
tests/test-product
tests/test-platform
tests/test-platformlist
-tests/test-isodetect
-tests/test-mediauris
-tests/test-treeuris
-tests/test-imageuris
tests/test-tree
tests/*.log
tests/*.trs
build/
gtk-doc.make
-data/95-osinfo.rules
-data/*/*/*.xml
-data/*/*/*/*.xml
-data/pci.ids
-data/usb.ids
tools/osinfo-detect
tools/osinfo-detect.1
-tools/osinfo-detect.exe
-tools/osinfo-db-validate
-tools/osinfo-db-validate.exe
-tools/osinfo-db-validate.1
tools/osinfo-query
tools/osinfo-query.1
-tools/osinfo-query.exe
tools/osinfo-install-script
-tools/osinfo-install-script.exe
tools/osinfo-install-script.1
docs/reference/Libosinfo.types
po/Makefile.in.in
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:17:23 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:17:23 +0100
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Update debian-8 URLS
Message-ID: <20190329181725.29823-1-fidencio@redhat.com>
Let's update debian-8 media URLs for the latest release and let's remove
the dead trees as those were removed from debian's website.
Fabiano Fid?ncio (2):
debian8: Update to latest release
debian8: Remove dead trees
data/os/debian.org/debian-8.xml.in | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:17:24 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:17:24 +0100
Subject: [Libosinfo] [osinfo-db PATCH 1/2] debian8: Update to latest release
In-Reply-To: <20190329181725.29823-1-fidencio@redhat.com>
References: <20190329181725.29823-1-fidencio@redhat.com>
Message-ID: <20190329181725.29823-2-fidencio@redhat.com>
The latest release for the main arches is 8.11.1 as they'll still be
supported as LTS. For the secondary arches, 8.11.0 was the last one.
Signed-off-by: Fabiano Fid?ncio
---
data/os/debian.org/debian-8.xml.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 4a8c307..744d05b 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -33,7 +33,7 @@
- http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/i386/iso-dvd/debian-8.10.0-i386-DVD-1.iso
+ http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/i386/iso-dvd/debian-8.11.1-i386-DVD-1.iso
Debian 8.\d+.\d+ i386 .*
@@ -41,7 +41,7 @@
install.386/initrd.gz
- http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/amd64/iso-dvd/debian-8.10.0-amd64-DVD-1.iso
+ http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-dvd/debian-8.11.1-amd64-DVD-1.iso
Debian 8.\d+.\d+ amd64 .*
@@ -49,7 +49,7 @@
install.amd/initrd.gz
- http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/arm64/iso-dvd/debian-8.10.0-arm64-DVD-1.iso
+ http://cdimage.debian.org/mirror/cdimage/archive/8.11.0/arm64/iso-dvd/debian-8.11.0-arm64-DVD-1.iso
Debian 8.\d+.\d+ arm64 .*
@@ -57,7 +57,7 @@
install.a64/initrd.gz
- http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/ppc64el/iso-dvd/debian-8.10.0-ppc64el-DVD-1.iso
+ http://cdimage.debian.org/mirror/cdimage/archive/8.11.0/ppc64el/iso-dvd/debian-8.11.0-ppc64el-DVD-1.iso
Debian 8.\d+.\d+ ppc64el .*
@@ -65,7 +65,7 @@
install/initrd.gz
- http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/s390x/iso-dvd/debian-8.10.0-s390x-DVD-1.iso
+ http://cdimage.debian.org/mirror/cdimage/archive/8.11.0/s390x/iso-dvd/debian-8.11.0-s390x-DVD-1.iso
Debian 8.\d+.\d+ s390x .*
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:17:25 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:17:25 +0100
Subject: [Libosinfo] [osinfo-db PATCH 2/2] debian8: Remove dead trees
In-Reply-To: <20190329181725.29823-1-fidencio@redhat.com>
References: <20190329181725.29823-1-fidencio@redhat.com>
Message-ID: <20190329181725.29823-3-fidencio@redhat.com>
Debian 8 trees have been removed from their website.
Signed-off-by: Fabiano Fid?ncio
---
data/os/debian.org/debian-8.xml.in | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 744d05b..623be03 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -73,18 +73,6 @@
boot/root.bin
-
-
- http://deb.debian.org/debian/dists/jessie/main/installer-i386
- current/images/netboot/debian-installer/i386/linux
- current/images/netboot/debian-installer/i386/initrd.gz
-
-
- http://deb.debian.org/debian/dists/jessie/main/installer-amd64
- current/images/netboot/debian-installer/amd64/linux
- current/images/netboot/debian-installer/amd64/initrd.gz
-
-
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:22:51 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:22:51 +0100
Subject: [Libosinfo] [osinfo-db PATCH 0/3] Add network-install resources
Message-ID: <20190329182254.30415-1-fidencio@redhat.com>
Fedora Silverblue, CentOS 7 and RHEL 7.* are the first targets for taking
advantage of network-install resources as those require more RAM during
installation time (when performing a network installation) than their
recommended amount of RAM.
Both CentOS 7 and RHEL 7.* need their memory bumped to 1.5GB during
installation and Fedora Silverblue needs 5GB!
I'm aware that fedora-rawhide will also need some adjustment, but I was
*not* able to successfully start an installation due to non related
issues. So, it'll be updated at some point, later on.
Fabiano Fid?ncio (3):
rhel7*: Add network-install resources
centos7: Add network-install resources
silverblue28 & 29: Add network-install resources
data/os/centos.org/centos-7.0.xml.in | 4 ++++
data/os/fedoraproject.org/silverblue-28.xml.in | 4 ++++
data/os/fedoraproject.org/silverblue-29.xml.in | 4 ++++
data/os/redhat.com/rhel-7-unknown.xml.in | 4 ++++
data/os/redhat.com/rhel-7.0.xml.in | 4 ++++
data/os/redhat.com/rhel-7.1.xml.in | 4 ++++
data/os/redhat.com/rhel-7.2.xml.in | 4 ++++
data/os/redhat.com/rhel-7.3.xml.in | 4 ++++
data/os/redhat.com/rhel-7.4.xml.in | 4 ++++
data/os/redhat.com/rhel-7.5.xml.in | 4 ++++
data/os/redhat.com/rhel-7.6.xml.in | 4 ++++
11 files changed, 44 insertions(+)
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:22:52 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:22:52 +0100
Subject: [Libosinfo] [osinfo-db PATCH 1/3] rhel7*: Add network-install
resources
In-Reply-To: <20190329182254.30415-1-fidencio@redhat.com>
References: <20190329182254.30415-1-fidencio@redhat.com>
Message-ID: <20190329182254.30415-2-fidencio@redhat.com>
In order to perform a tree based installation, dracut will download the
whole stage2 into memory, using them more memory than the recommended to
run the system.
It's documented in the 22th Note of the following link
https://access.redhat.com/articles/rhel-limits
"22. Network / PXE install requires at least 1.5 GB of RAM for the
install procedure only."
Signed-off-by: Fabiano Fid?ncio
---
data/os/redhat.com/rhel-7-unknown.xml.in | 4 ++++
data/os/redhat.com/rhel-7.0.xml.in | 4 ++++
data/os/redhat.com/rhel-7.1.xml.in | 4 ++++
data/os/redhat.com/rhel-7.2.xml.in | 4 ++++
data/os/redhat.com/rhel-7.3.xml.in | 4 ++++
data/os/redhat.com/rhel-7.4.xml.in | 4 ++++
data/os/redhat.com/rhel-7.5.xml.in | 4 ++++
data/os/redhat.com/rhel-7.6.xml.in | 4 ++++
8 files changed, 32 insertions(+)
diff --git a/data/os/redhat.com/rhel-7-unknown.xml.in b/data/os/redhat.com/rhel-7-unknown.xml.in
index c0be24a..83c7537 100644
--- a/data/os/redhat.com/rhel-7-unknown.xml.in
+++ b/data/os/redhat.com/rhel-7-unknown.xml.in
@@ -109,6 +109,10 @@
1073741824
10737418240
+
+
+ 2147483648
+
diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index c1850e5..e91446d 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -96,6 +96,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
index cb8c635..4e46f76 100644
--- a/data/os/redhat.com/rhel-7.1.xml.in
+++ b/data/os/redhat.com/rhel-7.1.xml.in
@@ -84,6 +84,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 4d167c1..88711f9 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -125,6 +125,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
diff --git a/data/os/redhat.com/rhel-7.3.xml.in b/data/os/redhat.com/rhel-7.3.xml.in
index 147c294..b1125b9 100644
--- a/data/os/redhat.com/rhel-7.3.xml.in
+++ b/data/os/redhat.com/rhel-7.3.xml.in
@@ -111,6 +111,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
diff --git a/data/os/redhat.com/rhel-7.4.xml.in b/data/os/redhat.com/rhel-7.4.xml.in
index cdc33a1..ef3faac 100644
--- a/data/os/redhat.com/rhel-7.4.xml.in
+++ b/data/os/redhat.com/rhel-7.4.xml.in
@@ -111,6 +111,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
diff --git a/data/os/redhat.com/rhel-7.5.xml.in b/data/os/redhat.com/rhel-7.5.xml.in
index f31e6c5..1fe0baf 100644
--- a/data/os/redhat.com/rhel-7.5.xml.in
+++ b/data/os/redhat.com/rhel-7.5.xml.in
@@ -111,6 +111,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in
index 615cecd..e0eb644 100644
--- a/data/os/redhat.com/rhel-7.6.xml.in
+++ b/data/os/redhat.com/rhel-7.6.xml.in
@@ -111,6 +111,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:22:53 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:22:53 +0100
Subject: [Libosinfo] [osinfo-db PATCH 2/3] centos7: Add network-install
resources
In-Reply-To: <20190329182254.30415-1-fidencio@redhat.com>
References: <20190329182254.30415-1-fidencio@redhat.com>
Message-ID: <20190329182254.30415-3-fidencio@redhat.com>
In order to perform a tree based installation, dracut will download the
whole stage2 into memory, using them more memory than the recommended to
run the system.
The value used is the same one used for RHEL, 1.5GB.
Signed-off-by: Fabiano Fid?ncio
---
data/os/centos.org/centos-7.0.xml.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index 5a3b65d..9e38617 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -74,6 +74,10 @@
1073741824
10737418240
+
+
+ 1610612736
+
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:22:54 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:22:54 +0100
Subject: [Libosinfo] [osinfo-db PATCH 3/3] silverblue28 & 29: Add
network-install resources
In-Reply-To: <20190329182254.30415-1-fidencio@redhat.com>
References: <20190329182254.30415-1-fidencio@redhat.com>
Message-ID: <20190329182254.30415-4-fidencio@redhat.com>
In order to perform a tree based installation, dracut seems to download
the whole OSTree into memory, using them more memory than the
recommended to run the system.
I didn't find any documented value for this, but I couldn't perform the
installation with less than 5GB of RAM.
Signed-off-by: Fabiano Fid?ncio
---
data/os/fedoraproject.org/silverblue-28.xml.in | 4 ++++
data/os/fedoraproject.org/silverblue-29.xml.in | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/data/os/fedoraproject.org/silverblue-28.xml.in b/data/os/fedoraproject.org/silverblue-28.xml.in
index f747060..ccaa322 100644
--- a/data/os/fedoraproject.org/silverblue-28.xml.in
+++ b/data/os/fedoraproject.org/silverblue-28.xml.in
@@ -34,6 +34,10 @@
2147483648
21474836480
+
+
+ 5368709120
+
diff --git a/data/os/fedoraproject.org/silverblue-29.xml.in b/data/os/fedoraproject.org/silverblue-29.xml.in
index 444de82..5a6afc4 100644
--- a/data/os/fedoraproject.org/silverblue-29.xml.in
+++ b/data/os/fedoraproject.org/silverblue-29.xml.in
@@ -45,6 +45,10 @@
2147483648
21474836480
+
+
+ 5368709120
+
--
2.20.1
From fidencio at redhat.com Fri Mar 29 18:28:13 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 29 Mar 2019 19:28:13 +0100
Subject: [Libosinfo] [libosinfo PATCH] gitignore: remove old entries
In-Reply-To: <20190329162642.15629-1-ptoscano@redhat.com>
References: <20190329162642.15629-1-ptoscano@redhat.com>
Message-ID:
On Fri, Mar 29, 2019 at 5:26 PM Pino Toscano wrote:
>
> Remove patterns referring to old tests, and in general to files that do
> not exist anymore.
> ---
> .gitignore | 22 ----------------------
> 1 file changed, 22 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index fb80e9f..f82d734 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -5,7 +5,6 @@ AUTHORS
> *~
> .deps
> .libs
> -.sc-start-sc_*
> Makefile
> Makefile.in
> aclocal.m4
> @@ -17,7 +16,6 @@ build-aux/depcomp
> build-aux/install-sh
> build-aux/ltmain.sh
> build-aux/missing
> -build-aux/mkinstalldirs
> build-aux/config.rpath
> build-aux/test-driver
> config.cache
> @@ -30,8 +28,6 @@ libtool
> m4
> stamp-h1
> tags
> -tests/test-skeleton
> -tests/test-skeleton.sh
> osinfo/libosinfo.pc
> osinfo/Libosinfo-1.0.gir
> osinfo/Libosinfo-1.0.typelib
> @@ -46,13 +42,11 @@ coverage/
> tests/test-device
> tests/test-os
> tests/test-entity
> -tests/test-hypervisor
> tests/test-list
> tests/test-db
> tests/test-devicelist
> tests/test-devicelinklist
> tests/test-filter
> -tests/test-hypervisorlist
> tests/test-install-script
> tests/test-image
> tests/test-imagelist
> @@ -60,35 +54,19 @@ tests/test-loader
> tests/test-media
> tests/test-productfilter
> tests/test-oslist
> -tests/test-os-resources
> tests/test-product
> tests/test-platform
> tests/test-platformlist
> -tests/test-isodetect
> -tests/test-mediauris
> -tests/test-treeuris
> -tests/test-imageuris
> tests/test-tree
> tests/*.log
> tests/*.trs
> build/
> gtk-doc.make
> -data/95-osinfo.rules
> -data/*/*/*.xml
> -data/*/*/*/*.xml
> -data/pci.ids
> -data/usb.ids
> tools/osinfo-detect
> tools/osinfo-detect.1
> -tools/osinfo-detect.exe
Why removing this one? osinfo-query is still part of libosinfo and
osinfo-detect.exe can be generated when building using mingw.
> -tools/osinfo-db-validate
> -tools/osinfo-db-validate.exe
> -tools/osinfo-db-validate.1
> tools/osinfo-query
> tools/osinfo-query.1
> -tools/osinfo-query.exe
Same about osinfo-query.exe
> tools/osinfo-install-script
> -tools/osinfo-install-script.exe
Same about osinfo-install-script.exe
> tools/osinfo-install-script.1
> docs/reference/Libosinfo.types
> po/Makefile.in.in
> --
> 2.20.1
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Leaving tools/osinfo-detect.exe, tools/osinfo-query.exe, and
tools/osinfo-install-script.exe ...
Reviewed-by: Fabiano Fid?ncio