Evolinx/packagekit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hif: Use new hawkey API for getting advisory details

Browse Source 
Minor edits and fixes by Kalev Lember <kalevlember@gmail.com>.
This commit is contained in:
Radek Holy 2014-04-08 13:36:36 +02:00 committed by Kalev Lember
parent 88d3d7289b
commit 870a49c4bd
3 changed files with 94 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backends/hif/hif-backend.c
View File

@ -245,34 +245,27 @@ hif_emit_package_list_filter (PkBackendJob *job,
}
/**
* hif_update_severity_to_info_enum:
* hif_advisory_type_to_info_enum:
*/
PkInfoEnum
hif_update_severity_to_info_enum (HyUpdateSeverity severity)
hif_advisory_type_to_info_enum (HyAdvisoryType type)
{
PkInfoEnum info_enum = HY_UPDATE_SEVERITY_UNKNOWN;
switch (severity) {
case HY_UPDATE_SEVERITY_SECURITY:
PkInfoEnum info_enum = PK_INFO_ENUM_UNKNOWN;
switch (type) {
case HY_ADVISORY_SECURITY:
info_enum = PK_INFO_ENUM_SECURITY;
break;
case HY_UPDATE_SEVERITY_IMPORTANT:
info_enum = PK_INFO_ENUM_IMPORTANT;
break;
case HY_UPDATE_SEVERITY_BUGFIX:
case HY_ADVISORY_BUGFIX:
info_enum = PK_INFO_ENUM_BUGFIX;
break;
case HY_UPDATE_SEVERITY_NORMAL:
case HY_UPDATE_SEVERITY_UNKNOWN:
case HY_ADVISORY_UNKNOWN:
info_enum = PK_INFO_ENUM_NORMAL;
break;
case HY_UPDATE_SEVERITY_ENHANCEMENT:
case HY_ADVISORY_ENHANCEMENT:
info_enum = PK_INFO_ENUM_ENHANCEMENT;
break;
case HY_UPDATE_SEVERITY_LOW:
info_enum = PK_INFO_ENUM_LOW;
break;
default:
g_warning ("Failed to find HyUpdateSeverity enum %i", severity);
g_warning ("Failed to find HyAdvisoryType enum %i", type);
break;
}
return info_enum;

3
backends/hif/hif-backend.h
View File

@ -24,6 +24,7 @@
#include <glib.h>
#include <hawkey/advisory.h>
#include <hawkey/package.h>
#include <hawkey/packagelist.h>
@ -31,7 +32,7 @@
PkErrorEnum hif_rc_to_error_enum (gint rc);
const gchar *hif_rc_to_error_str (gint rc);
PkInfoEnum hif_update_severity_to_info_enum (HyUpdateSeverity severity);
PkInfoEnum hif_advisory_type_to_info_enum (HyAdvisoryType type);
void hif_emit_package (PkBackendJob *job,
PkInfoEnum info,
HyPackage pkg);

91
backends/hif/pk-backend-hif.c
View File

@ -32,6 +32,8 @@
#include <pk-backend.h>
#include <packagekit-glib2/pk-debug.h>
#include <hawkey/advisory.h>
#include <hawkey/advisoryref.h>
#include <hawkey/packagelist.h>
#include <hawkey/packageset.h>
#include <hawkey/query.h>
@ -732,6 +734,24 @@ pk_backend_what_provides_decompose (gchar **values, GError **error)
return search;
}
/**
* hif_package_get_advisory:
*/
static HyAdvisory
hif_package_get_advisory (HyPackage package)
{
HyAdvisoryList advisorylist;
HyAdvisory advisory = NULL;
advisorylist = hy_package_get_advisories (package, HY_EQ);
if (hy_advisorylist_count (advisorylist) > 0)
advisory = hy_advisorylist_get_clone (advisorylist, 0);
hy_advisorylist_free (advisorylist);
return advisory;
}
/**
* pk_backend_search_thread:
*/
@ -895,12 +915,17 @@ pk_backend_search_thread (PkBackendJob *job, GVariant *params, gpointer user_dat
if (pk_backend_job_get_role (job) == PK_ROLE_ENUM_GET_UPDATES) {
guint i;
HyPackage pkg;
HyUpdateSeverity severity;
HyAdvisory advisory;
HyAdvisoryType type;
PkInfoEnum info_enum;
FOR_PACKAGELIST(pkg, pkglist, i) {
severity = hy_package_get_update_severity (pkg);
info_enum = hif_update_severity_to_info_enum (severity);
hif_package_set_info (pkg, info_enum);
advisory = hif_package_get_advisory (pkg);
if (advisory != NULL) {
type = hy_advisory_get_type (advisory);
hy_advisory_free (advisory);
info_enum = hif_advisory_type_to_info_enum (type);
hif_package_set_info (pkg, info_enum);
}
}
}
@ -3227,8 +3252,14 @@ pk_backend_get_update_detail_thread (PkBackendJob *job, GVariant *params, gpoint
GError *error = NULL;
GHashTable *hash = NULL;
guint i;
gint j;
HifState *state_local;
HyPackage pkg;
HyAdvisory advisory;
HyAdvisoryRefList references;
GPtrArray *vendor_urls;
GPtrArray *bugzilla_urls;
GPtrArray *cve_urls;
HySack sack = NULL;
PkBackendHifJobData *job_data = pk_backend_job_get_user_data (job);
PkBitfield filters;
@ -3285,19 +3316,63 @@ pk_backend_get_update_detail_thread (PkBackendJob *job, GVariant *params, gpoint
pkg = g_hash_table_lookup (hash, package_ids[i]);
if (pkg == NULL)
continue;
advisory = hif_package_get_advisory (pkg);
if (advisory == NULL)
continue;
references = hy_advisory_get_references (advisory);
vendor_urls = g_ptr_array_new_with_free_func (g_free);
bugzilla_urls = g_ptr_array_new_with_free_func (g_free);
cve_urls = g_ptr_array_new_with_free_func (g_free);
for (j = 0; j < hy_advisoryreflist_count (references); j++) {
HyAdvisoryRef reference;
HyAdvisoryRefType type;
const gchar *url;
reference = hy_advisoryreflist_get_clone (references, j);
type = hy_advisoryref_get_type (reference);
url = hy_advisoryref_get_url (reference);
hy_advisoryref_free (reference);
if (url == NULL)
continue;
switch (type) {
case HY_REFERENCE_VENDOR:
g_ptr_array_add (vendor_urls, g_strdup (url));
break;
case HY_REFERENCE_BUGZILLA:
g_ptr_array_add (bugzilla_urls, g_strdup (url));
break;
case HY_REFERENCE_CVE:
g_ptr_array_add (cve_urls, g_strdup (url));
break;
default:
break;
}
}
g_ptr_array_add (vendor_urls, NULL);
g_ptr_array_add (bugzilla_urls, NULL);
g_ptr_array_add (cve_urls, NULL);
pk_backend_job_update_detail (job,
package_ids[i],
NULL,
NULL,
hy_package_get_update_urls_vendor (pkg),
hy_package_get_update_urls_bugzilla (pkg),
hy_package_get_update_urls_cve (pkg),
(gchar **) vendor_urls->pdata,
(gchar **) bugzilla_urls->pdata,
(gchar **) cve_urls->pdata,
PK_RESTART_ENUM_NONE, /* FIXME */
hy_package_get_update_description (pkg),
hy_advisory_get_description (advisory),
NULL,
PK_UPDATE_STATE_ENUM_STABLE, /* FIXME */
NULL, /* issued */
NULL /* updated */);
hy_advisoryreflist_free (references);
hy_advisory_free (advisory);
g_ptr_array_unref (vendor_urls);
g_ptr_array_unref (bugzilla_urls);
g_ptr_array_unref (cve_urls);
}
/* done */