msm: consistency for equally ranked keys

The conflicts within the packages of equally ranked keys
must be treated usually by rpm.

Without this change, installation of conflicting packages
is not possible when msm plugin is active.

Change-Id: I909540524c7e2b43229b8aac90f66430041cbd55
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>

diff --git a/plugins/msm-plugin.c b/plugins/msm-plugin.c
index 2290ac2..3a1c653 100644 (file)
--- a/plugins/msm-plugin.c
+++ b/plugins/msm-plugin.c
@@ -620,9 +620,9 @@ rpmRC PLUGINHOOK_FSM_INIT_FUNC(const char* path, mode_t mode)
         //rpmlog(RPMLOG_DEBUG, "rpmteN(ctx->te) %s fc->pkg_name: %s\n", rpmteN(ctx->te), fc->pkg_name);
         /* There is a conflict, see if we are not allowed to overwrite */
         if ((!current || 
-           (strcmp(current->rankkey, fc->sw_source->rankkey) >= 0)) &&
+           (strcmp(current->rankkey, fc->sw_source->rankkey) > 0)) &&
            (strcmp(rpmteN(ctx->te), fc->pkg_name))) {
-            rpmlog(RPMLOG_ERR, "%s has file conflict in %s from sw source %s\n",
+            rpmlog(RPMLOG_ERR, "%s has file security conflict in %s from sw source %s\n",
                    rpmteN(ctx->te), fc->path, fc->sw_source->name);
             return RPMRC_FAIL;
         }