From kde-commits Mon Oct 31 23:10:37 2016 From: Matthias Klumpp Date: Mon, 31 Oct 2016 23:10:37 +0000 To: kde-commits Subject: [discover] libdiscover/backends/PackageKitBackend: trivial: Fix minor AppStream porting quirk Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=147795544726821 Git commit f2bd85ec4025c2b14acdac9e018a00ea9b14e520 by Matthias Klumpp. Committed on 31/10/2016 at 23:09. Pushed by matthiask into branch 'master'. trivial: Fix minor AppStream porting quirk We didn't need to drop the assert (I wonder if we should fail better in case of a broken component?), also fix the warning in case we failed to load the data pool. M +1 -0 libdiscover/backends/PackageKitBackend/AppPackageKitResource= .cpp M +1 -1 libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp http://commits.kde.org/discover/f2bd85ec4025c2b14acdac9e018a00ea9b14e520 diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.c= pp b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp index 2a04c17..7b116b7 100644 --- a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp +++ b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp @@ -33,6 +33,7 @@ AppPackageKitResource::AppPackageKitResource(const AppStr= eam::Component& data, c : PackageKitResource(packageName, QString(), parent) , m_appdata(data) { + Q_ASSERT(data.isValid()); } = QString AppPackageKitResource::name() diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b= /libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp index 15d9ada..3143beb 100644 --- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp +++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp @@ -56,7 +56,7 @@ PackageKitBackend::PackageKitBackend(QObject* parent) { bool b =3D m_appdata.load(); if (!b) { - qWarning() << "Couldn't load the AppStream database"; + qWarning() << "Could not open the AppStream metadata pool"; = auto msg =3D new QAction(i18n("Got it"), this); msg->setWhatsThis(i18n("Please make sure that Appstream is properl= y set up on your system"));