summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2015-09-23 11:28:23 +0100
committerRichard Hughes <richard@hughsie.com>2015-09-23 11:28:23 +0100
commitc469ad4fa0b12532a031d7ac66cd1fc29b25bd4c (patch)
tree7eac7b3d2476a627452c7a08faf26e0c5b4161f7
parent09a4ba22a7d5766efcb8eeb674478d69c2e4ba64 (diff)
downloadappstream-glib-c469ad4fa0b12532a031d7ac66cd1fc29b25bd4c.tar.gz
trivial: Do not subsume vetos if AS_APP_SUBSUME_FLAG_PARTIAL is used
-rw-r--r--libappstream-glib/as-app.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libappstream-glib/as-app.c b/libappstream-glib/as-app.c
index 5cbfb3f..4e7266c 100644
--- a/libappstream-glib/as-app.c
+++ b/libappstream-glib/as-app.c
@@ -2701,12 +2701,6 @@ as_app_subsume_private (AsApp *app, AsApp *donor, AsAppSubsumeFlags flags)
as_app_add_kudo (app, tmp);
}
- /* vetos */
- for (i = 0; i < priv->vetos->len; i++) {
- tmp = g_ptr_array_index (priv->vetos, i);
- as_app_add_veto (app, "%s", tmp);
- }
-
/* categories */
for (i = 0; i < priv->categories->len; i++) {
tmp = g_ptr_array_index (priv->categories, i);
@@ -2759,6 +2753,12 @@ as_app_subsume_private (AsApp *app, AsApp *donor, AsAppSubsumeFlags flags)
if ((flags & AS_APP_SUBSUME_FLAG_PARTIAL) > 0)
return;
+ /* vetos */
+ for (i = 0; i < priv->vetos->len; i++) {
+ tmp = g_ptr_array_index (priv->vetos, i);
+ as_app_add_veto (app, "%s", tmp);
+ }
+
/* languages */
keys = g_hash_table_get_keys (priv->languages);
for (l = keys; l != NULL; l = l->next) {