On Thu, Nov 28, 2013 at 03:10:22PM +0000, Zeeshan Ali (Khattak) wrote: > Add: > > * ability to associate media to one or more variants of the OS in the > 'media' XML node. For example: > > <os id="http://microsoft.com/win/7";> > <short-id>win7</short-id> > <name>Microsoft Windows 7</name> > .. > > <variant id="starter"> > <name>Microsoft Windows 7 Starter</name> > </variant> > <variant id="home-basic"> > <name>Microsoft Windows 7 Home Basic</name> > </variant> > <variant id="home-premium"> > <name>Microsoft Windows 7 Home Premium</name> > </variant> > .. > > <media installer-reboots="2" arch="x86_64"> > <variant id="home-premium"/> > <iso> > .. > </iso> > </media> > </os> > > * API to query variants of the OS, media is associated with. > --- > data/schemas/libosinfo.rng | 6 ++++++ > osinfo/libosinfo.syms | 2 ++ > osinfo/osinfo_db.c | 8 +++++++- > osinfo/osinfo_loader.c | 18 ++++++++++++++++-- > osinfo/osinfo_media.c | 39 +++++++++++++++++++++++++++++++++++++++ > osinfo/osinfo_media.h | 3 +++ > 6 files changed, 73 insertions(+), 3 deletions(-) > diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c > index affc49b..e9ce8e1 100644 > --- a/osinfo/osinfo_loader.c > +++ b/osinfo/osinfo_loader.c > @@ -859,7 +859,6 @@ static OsinfoMedia *osinfo_loader_media (OsinfoLoader *loader, > xmlChar *installer = xmlGetProp(root, BAD_CAST OSINFO_MEDIA_PROP_INSTALLER); > xmlChar *installer_reboots = > xmlGetProp(root, BAD_CAST OSINFO_MEDIA_PROP_INSTALLER_REBOOTS); > - xmlChar *variant = xmlGetProp(root, BAD_CAST OSINFO_MEDIA_PROP_VARIANT); Ah, and now you remove the bogus variable from the previous patch... 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
