[gnome-software] repos: Avoid conflicting with rpm-ostree



commit 00708aa8e3ef60ab7758495f14992360e41c5423
Author: Kalev Lember <klember redhat com>
Date:   Sun Feb 24 17:11:07 2019 +0100

    repos: Avoid conflicting with rpm-ostree
    
    Now that rpm-ostree sets the origin, the repos plugin works just fine
    together with rpm-ostree.

 plugins/repos/gs-plugin-repos.c           | 1 +
 plugins/rpm-ostree/gs-plugin-rpm-ostree.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/plugins/repos/gs-plugin-repos.c b/plugins/repos/gs-plugin-repos.c
index 932e33b2..714a24f8 100644
--- a/plugins/repos/gs-plugin-repos.c
+++ b/plugins/repos/gs-plugin-repos.c
@@ -43,6 +43,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 
        /* need application IDs */
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "packagekit-refine");
+       gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "rpm-ostree");
 }
 
 void
diff --git a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
index 43c189b1..b8258e45 100644
--- a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
+++ b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
@@ -70,7 +70,6 @@ gs_plugin_initialize (GsPlugin *plugin)
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "packagekit-refresh");
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "packagekit-upgrade");
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "packagekit-url-to-app");
-       gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "repos");
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "systemd-updates");
 
        /* need pkgname */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]