Fix usage of media's application ID

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2019-04-10 14:19:21 +02:00
parent 018b4858c3
commit 3272dc3464
2 changed files with 48 additions and 2 deletions

View File

@ -0,0 +1,38 @@
From 2626058a7921749387f8d3107241af7507f48c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
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 <fidencio@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---
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

View File

@ -3,10 +3,14 @@
Summary: A library for managing OS information for virtualization
Name: libosinfo
Version: 1.4.0
Release: 1%{?dist}%{?extra_release}
Release: 2%{?dist}%{?extra_release}
License: LGPLv2+
Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
URL: https://libosinfo.org/
###Patches###
Patch0001: 0001-media-Fix-usage-of-application-id.patch
BuildRequires: gettext-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
@ -17,6 +21,7 @@ BuildRequires: /usr/bin/pod2man
BuildRequires: hwdata
BuildRequires: gobject-introspection-devel
BuildRequires: osinfo-db >= 20181011-1
BuildRequires: git
Requires: hwdata
Requires: osinfo-db >= 20181011-1
Requires: osinfo-db-tools
@ -43,7 +48,7 @@ combination.
Libraries, includes, etc. to compile with the libosinfo library
%prep
%setup -q
%autosetup -S git
%build
%configure --enable-introspection=yes --enable-vala=yes
@ -97,6 +102,9 @@ fi
%{_datadir}/vala/vapi/libosinfo-1.0.vapi
%changelog
* Wed Apr 10 2019 Fabiano Fidêncio <fidencio@redhat.com> - 1.4.0-2
- Fix usage of application ID
* Fri Mar 01 2019 Fabiano Fidêncio <fidencio@redhat.com> 1.4.0-1
- Update to 1.4.0 release