[Libosinfo] [PATCH 3/4] recognize Mageia 4.1

[Christophe Fergeau]

On Fri, Mar 25, 2016 at 10:05:58PM +0100, Christophe Fergeau wrote:
> From: Thierry Vignaud <thierry.vignaud at gmail.com>
> 
> ---
>  data/os/mageia.org/mageia-4.1.xml.in               | 43 ++++++++++++++++++++++
>  po/POTFILES.in                                     |  1 +
>  .../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 +++++++++++++++
>  .../Mageia-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 +++++++++++++++
>  .../mageia/mageia4.1/Mageia-4.1-dual-DVD.iso.txt   | 29 +++++++++++++++
>  .../mageia/mageia4.1/Mageia-4.1-i586-DVD.iso.txt   | 29 +++++++++++++++
>  .../mageia/mageia4.1/Mageia-4.1-x86_64-DVD.iso.txt | 29 +++++++++++++++
>  11 files changed, 305 insertions(+)
>  create mode 100644 data/os/mageia.org/mageia-4.1.xml.in
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-LiveCD-GNOME-en-i586-CD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-LiveCD-KDE4-en-i586-CD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-LiveDVD-GNOME-i586-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-LiveDVD-GNOME-x86_64-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-LiveDVD-KDE4-i586-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-LiveDVD-KDE4-x86_64-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-dual-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-i586-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia4.1/Mageia-4.1-x86_64-DVD.iso.txt
> 
> diff --git a/data/os/mageia.org/mageia-4.1.xml.in b/data/os/mageia.org/mageia-4.1.xml.in
> new file mode 100644
> index 0000000..6410b79
> --- /dev/null
> +++ b/data/os/mageia.org/mageia-4.1.xml.in
> @@ -0,0 +1,43 @@
> +<libosinfo version="0.0.1">
> +  <os id="http://mageia.org/mageia/4.1">
> +    <short-id>mageia4.1</short-id>
> +    <_name>Mageia 4.1</_name>
> +    <_vendor>Mageia</_vendor>
> +    <family>linux</family>
> +    <distro>mageia</distro>
> +    <version>5</version>

Should be 4.1

> +    <derives-from id="http://mageia.org/mageia/4"/>
> +    <release-date>2014-06-20</release-date>
> +    <eol-date>2015-09-19</eol-date>
> +
> +    <media arch="i686">
> +      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4.1-i586-DVD.iso</url>
> +<!--
> +      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4.1-dual-CD.iso</url>
> +-->
> +      <iso>
> +        <volume-id>Mageia-4.1(-i586)?</volume-id>
> +      </iso>
> +    </media>
> +    <media arch="x86_64">
> +      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4.1-x86_64-DVD.iso</url>
> +<!--
> +      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4.1-dual-CD.iso</url>
> +-->
> +      <iso>
> +        <volume-id>Mageia-4.1(-x86_64)?</volume-id>

Same comment about the 2 regexps matching 'Mageia-4.1', I'd change the
i686 one to
"Mageia-4.1-i586" to remove the ambiguity.


Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20160325/43ea0548/attachment.sig>