On Thu, Aug 11, 2016 at 03:49:33PM +0200, Thierry Vignaud wrote: > On 11 August 2016 at 13:03, Daniel P. Berrange <berrange@xxxxxxxxxx> wrote: > > On Thu, Aug 11, 2016 at 11:21:20AM +0200, Thierry Vignaud wrote: > >> --- > >> data/os/mageia.org/mageia-4.xml.in | 77 ++++++++++++++++++++++++++++++++++++++ > >> 1 file changed, 77 insertions(+) > >> create mode 100644 data/os/mageia.org/mageia-4.xml.in > >> > >> diff --git a/data/os/mageia.org/mageia-4.xml.in b/data/os/mageia.org/mageia-4.xml.in > >> new file mode 100644 > >> index 0000000..3faf39f > >> --- /dev/null > >> +++ b/data/os/mageia.org/mageia-4.xml.in > >> @@ -0,0 +1,77 @@ > >> +<libosinfo version="0.0.1"> > >> + <os id="http://mageia.org/mageia/4";> > >> + <short-id>mageia4</short-id> > >> + <_name>Mageia 4</_name> > >> + <_vendor>Mageia</_vendor> > >> + <family>linux</family> > >> + <distro>mageia</distro> > >> + <version>4</version> > >> + <derives-from id="http://mageia.org/mageia/3"/> > >> + <release-date>2014-02-01</release-date> > >> + <eol-date>2015-09-19</eol-date> > >> + > >> + <variant id="live"> > >> + <_name>Mageia 4 Live</_name> > >> + </variant> > >> + <variant id="net-install"> > >> + <_name>Mageia 4 Net-install</_name> > >> + </variant> > >> + <variant id="regular-installer"> > >> + <_name>Mageia 4 DVD Installer</_name> > >> + </variant> > >> + > >> + <media arch="i686"> > >> + <variant id="net-install"/> > >> + <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4-Boot-i586-CD.iso</url> > >> + <iso> > >> + <volume-id>Mga Boot ISO</volume-id> > >> + </iso> > >> + <kernel>isolinux/i386/vmlinuz</kernel> > >> + <initrd>isolinux/i386/all.rdz</initrd> > >> + </media> > >> + > >> + <media arch="x86_64"> > >> + <variant id="net-install"/> > >> + <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4-Boot-x86_64-CD.iso</url> > >> + <iso> > >> + <volume-id>Mageia 4 x86_64 Netinstall</volume-id> > >> + </iso> > >> + <kernel>isolinux/x86_64/vmlinuz</kernel> > >> + <initrd>isolinux/x86_64/all.rdz</initrd> > >> + </media> > >> + > >> + <media arch="i686"> > >> + <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4-i586-DVD.iso</url> > >> +<!-- > >> + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-dual-DVD.iso</url> > >> +--> > > > > Any reason you left these comments in here and later ? > > B/c 2 ISOs have the same ids sadly... > See also existing entriyes for mageia3- > > >> + <iso> > >> + <volume-id>Mageia-4(-i586)?</volume-id> > >> + </iso> > >> + <kernel>isolinux/i386/vmlinuz</kernel> > >> + <initrd>isolinux/i386/all.rdz</initrd> > >> + </media> > >> + <media arch="x86_64"> > >> + <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4-x86_64-DVD.iso</url> > >> +<!-- > >> + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-dual-DVD.iso</url> > >> +--> > >> + <iso> > >> + <volume-id>Mageia-4(-x86_64)?</volume-id> > >> + </iso> > >> + <kernel>isolinux/x86_64/vmlinuz</kernel> > >> + <initrd>isolinux/x86_64/all.rdz</initrd> > >> + </media> > >> + <media live="true" arch="i686"> > >> + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-LiveDVD-KDE4-i586-DVD.iso</url> > > > > Does 'fr' imply that this ISO is in french ? Seems like we should > > be using 'en' as you have for the other URLs above to be consistent. > > That's because the web site redirect there to me, like it did for > Christophe when he submitted mageia[1-3]. Ok, so this is all a big mess, and not really your fault since the existing data is all wrong too. These URLs are not in fact download links. They point to webpages which use awful javascript magic to redirect you to an actual download link. ie, an application using libosinfo which tries to fetch the ISO with that link is going to fail, because they'll just fetch an HTML page. I don't see any way to get a direct download link for mageia images which works in same way as othre distros. ie a link which automatically redirects at the HTTP level directly to the download file. So I'm afraid you'll have to remove all these URLs. I'm going to submit a patch which removes the URLs from existing files too since its all wrong. To support this would require us to have some kind of explicit support for mirrorlists. eg you can get a list of mageia mirror sites via: http://mirrors.mageia.org/api/mageia.cauldron.x86_64.list you'd have to then parse that an append the path to the ISO image. So somehow we'd need to encode the mirror base URL and metadata on how to process it Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
