Hello community, here is the log from the commit of package libosinfo for openSUSE:Factory checked in at 2019-04-15 11:49:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosinfo (Old) and /work/SRC/openSUSE:Factory/.libosinfo.new.17052 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosinfo" Mon Apr 15 11:49:54 2019 rev:34 rq:692971 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libosinfo/libosinfo.changes 2019-03-04 09:12:46.684683006 +0100 +++ /work/SRC/openSUSE:Factory/.libosinfo.new.17052/libosinfo.changes 2019-04-15 11:49:56.638470488 +0200 @@ -1,0 +2,7 @@ +Wed Apr 10 09:18:39 MDT 2019 - [email protected] + +- Upstream bug fixes from Fabiano Fidêncio <[email protected]> + 0001-media-Fix-usage-of-application-id.patch + 0002-loader-Properly-load-the-arch-value-for-images.patch + +------------------------------------------------------------------- New: ---- 0001-media-Fix-usage-of-application-id.patch 0002-loader-Properly-load-the-arch-value-for-images.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosinfo.spec ++++++ --- /var/tmp/diff_new_pack.4tIh0j/_old 2019-04-15 11:49:59.722472122 +0200 +++ /var/tmp/diff_new_pack.4tIh0j/_new 2019-04-15 11:49:59.726472125 +0200 @@ -28,6 +28,8 @@ Url: https://releases.pagure.org/libosinfo/ Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.gz Source1: ids.tar.bz2 +Patch1: 0001-media-Fix-usage-of-application-id.patch +Patch2: 0002-loader-Properly-load-the-arch-value-for-images.patch BuildRequires: libcurl-devel BuildRequires: vala BuildRequires: pkgconfig(check) @@ -85,6 +87,8 @@ %endif %prep %setup -q -a 1 +%patch1 -p1 +%patch2 -p1 %build %configure \ ++++++ 0001-media-Fix-usage-of-application-id.patch ++++++ >From 2626058a7921749387f8d3107241af7507f48c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <[email protected]> Date: Mon, 1 Apr 2019 22:40:48 +0200 Subject: [PATCH] media: Fix usage of application id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Christophe Fergeau pointed this issue out during the review of 6d789033e and, even though, the bogus code ended up merged (sorry, mea culpa here!). Signed-off-by: Fabiano Fidêncio <[email protected]> Reviewed-by: Cole Robinson <[email protected]> --- osinfo/osinfo_media.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index b16fcf6..4f86c2b 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -830,10 +830,10 @@ create_from_location_async_data(CreateFromLocationAsyncData *data) osinfo_entity_set_param(OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_PUBLISHER_ID, data->publisher); - if (!is_str_empty(data->pvd.application)) + if (!is_str_empty(data->application)) osinfo_entity_set_param(OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_APPLICATION_ID, - data->pvd.application); + data->application); index = (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? 0 : 1; vol_size = ((gint64) data->pvd.volume_space_size[index]) * -- 2.20.1 ++++++ 0002-loader-Properly-load-the-arch-value-for-images.patch ++++++ >From 1940739805409af9e39c61dbfe238e6c9b1519b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <[email protected]> Date: Wed, 10 Apr 2019 13:45:14 +0200 Subject: [PATCH] loader: Properly load the arch value for images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit osinfo_loader_image() has been considering the XML tag for the images' architecture was "architecture", while it actually is "arch". By trying to read the wrong tag, no arch was loaded, causing then any image load to fail with: CRITICAL **: 13:30:06.539: osinfo_entity_set_param: assertion 'value != NULL' failed Signed-off-by: Fabiano Fidêncio <[email protected]> --- osinfo/osinfo_loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index e30148b..84c25e5 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -1297,8 +1297,7 @@ static OsinfoImage *osinfo_loader_image(OsinfoLoader *loader, { NULL, G_TYPE_INVALID } }; - gchar *arch = (gchar *)xmlGetProp(root, - BAD_CAST OSINFO_IMAGE_PROP_ARCHITECTURE); + gchar *arch = (gchar *)xmlGetProp(root, BAD_CAST "arch"); gchar *format = (gchar *)xmlGetProp(root, BAD_CAST OSINFO_IMAGE_PROP_FORMAT); gchar *cloud_init = (gchar *)xmlGetProp(root, -- 2.20.1
