libsolv/libsolv-0.7.15-x86_64-multiarch-coexistence.patch

13 lines
543 B
Diff
Raw Permalink Normal View History

--- libsolv-0.7.15/src/rules.c.orig 2020-09-13 11:49:27.386000000 +0200
+++ libsolv-0.7.15/src/rules.c 2020-09-13 11:46:18.006000000 +0200
@@ -1075,6 +1075,9 @@
p = 0;
if (s->name == ps->name)
{
+ /* x86-64: allow cohexistence with x86 arch packages */
+ if (ps->arch != s->arch && !s->supplements)
+ continue;
/* optimization: do not add the same-name conflict rule if it was
* already added when we looked at the other package.
* (this assumes pool_colormatch is symmetric) */