Silvan Calarco
4324cde5bc
update x86_64-multiarch-coexistence patch to only resolve supplements of the main arch [release 0.7.15-1mamba;Sun Sep 13 2020]
13 lines
543 B
Diff
13 lines
543 B
Diff
--- 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) */
|