[gnome-software] When matching a wildcard match the prefix
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] When matching a wildcard match the prefix
- Date: Fri, 27 May 2016 07:17:48 +0000 (UTC)
commit 0acee74e99ef6ca412059d5e74f21c8ed8492092
Author: Richard Hughes <richard hughsie com>
Date: Thu May 26 19:10:53 2016 +0100
When matching a wildcard match the prefix
This allows plugins to adopt() the application if the management plugin is
not being set automatically in appstream.
src/plugins/gs-plugin-appstream.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/gs-plugin-appstream.c b/src/plugins/gs-plugin-appstream.c
index 6c30270..8ce0b12 100644
--- a/src/plugins/gs-plugin-appstream.c
+++ b/src/plugins/gs-plugin-appstream.c
@@ -238,6 +238,7 @@ gs_plugin_refine_from_id (GsPlugin *plugin,
/* find the best app when matching any prefixes */
if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) {
g_autoptr(GPtrArray) items = NULL;
+ g_autofree gchar *id_wildcard = g_strdup (id);
items = as_store_get_apps_by_id (priv->store, id);
for (i = 0; i < items->len; i++) {
@@ -258,13 +259,16 @@ gs_plugin_refine_from_id (GsPlugin *plugin,
if (item != NULL) {
g_warning ("found duplicate %s for wildcard %s",
as_app_get_id (item_tmp),
- id);
+ id_wildcard);
continue;
}
/* only match the first entry */
g_debug ("found %s for wildcard %s",
- as_app_get_id (item_tmp), id);
+ as_app_get_id (item_tmp), id_wildcard);
+
+ /* adopt the new prefix */
+ gs_app_set_id (app, as_app_get_id (item_tmp));
/* refine using this */
item = item_tmp;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]