diff options
| author | José Bollo <jose.bollo@open.eurogiciel.org> | 2015-04-10 16:32:51 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@open.eurogiciel.org> | 2015-04-28 16:13:15 +0200 |
| commit | 505aac517c1319c6b5c122a4e2cf34b6c0089d34 (patch) | |
| tree | 9eed0edcf1203b818c2fbb33da9026b6bdcf5c07 | |
| parent | edf906fa2e72b3f33e00a2262962be62e01df9db (diff) | |
| download | rpm-505aac517c1319c6b5c122a4e2cf34b6c0089d34.tar.gz rpm-505aac517c1319c6b5c122a4e2cf34b6c0089d34.tar.bz2 rpm-505aac517c1319c6b5c122a4e2cf34b6c0089d34.zip | |
msm: consistency for equally ranked keyssubmit/tizen_common/20150518.122814accepted/tizen/common/20150520.164523tizen_3.0.2015.q2_common
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>
| -rw-r--r-- | plugins/msm-plugin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/msm-plugin.c b/plugins/msm-plugin.c index 2290ac271..3a1c653e6 100644 --- 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; } |