[Libosinfo] [PATCH osinfo-db 1/4] fedora: anchor ambiguous treeinfo versions

[Cole Robinson]

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 <crobinso at redhat.com>
>> ---
>>  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 @@
>>        <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/</url>
>>        <treeinfo>
>>  	<family>Fedora</family>
>> -	<version>7</version>
>> +	<version>^7$</version>
>>  	<arch>i386</arch>
>>        </treeinfo>
>>      </tree>
>> @@ -106,7 +106,7 @@
>>        <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/</url>
>>        <treeinfo>
>>  	<family>Fedora</family>
>> -	<version>7</version>
>> +	<version>^7$</version>
>>  	<arch>x86_64</arch>
>>        </treeinfo>
>>      </tree>
>> 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 @@
>>        <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/</url>
>>        <treeinfo>
>>  	<family>Fedora</family>
>> -	<version>8</version>
>> +	<version>^8$</version>
>>  	<arch>i386</arch>
>>        </treeinfo>
>>      </tree>
>> @@ -118,7 +118,7 @@
>>        <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/</url>
>>        <treeinfo>
>>  	<family>Fedora</family>
>> -	<version>8</version>
>> +	<version>^8$</version>
>>  	<arch>x86_64</arch>
>>        </treeinfo>
>>      </tree>
>> 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 @@
>>        <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/</url>
>>        <treeinfo>
>>  	<family>Fedora</family>
>> -	<version>9</version>
>> +	<version>^9$</version>
>>  	<arch>i386</arch>
>>        </treeinfo>
>>      </tree>
>> @@ -359,7 +359,7 @@
>>        <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/</url>
>>        <treeinfo>
>>  	<family>Fedora</family>
>> -	<version>9</version>
>> +	<version>^9$</version>
>>  	<arch>x86_64</arch>
>>        </treeinfo>
>>      </tree>
> 
> 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