|
 |
ecf63f |
From b1014a431541444bcd39c6ec83c1ec935c7f0aae Mon Sep 17 00:00:00 2001
|
|
|
ecf63f |
From: Michael Schroeder <mls@suse.de>
|
|
|
ecf63f |
Date: Tue, 17 May 2016 13:31:58 +0200
|
|
|
ecf63f |
Subject: [PATCH] Fix supplements handling when implicitobsoleteusescolors is
|
|
|
ecf63f |
set
|
|
|
ecf63f |
|
|
|
ecf63f |
This currently relys on the infarch lockstep handling a bit. Let's
|
|
|
ecf63f |
see if this is enough or we need some better filtering code.
|
|
|
ecf63f |
---
|
|
|
ecf63f |
src/solver.c | 20 ++++++++++++++++++++
|
|
|
ecf63f |
.../supplements_implicitobsoleteusescolors.t | 20 ++++++++++++++++++++
|
|
|
ecf63f |
2 files changed, 40 insertions(+)
|
|
|
ecf63f |
create mode 100644 test/testcases/weakdeps/supplements_implicitobsoleteusescolors.t
|
|
|
ecf63f |
|
|
|
ecf63f |
diff --git a/src/solver.c b/src/solver.c
|
|
|
ecf63f |
index 5da8529..4f849ec 100644
|
|
|
ecf63f |
--- a/src/solver.c
|
|
|
ecf63f |
+++ b/src/solver.c
|
|
|
ecf63f |
@@ -2636,6 +2636,26 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
|
|
|
ecf63f |
dqs.count = j;
|
|
|
ecf63f |
}
|
|
|
ecf63f |
|
|
|
ecf63f |
+ /* implicitobsoleteusescolors doesn't mix well with supplements.
|
|
|
ecf63f |
+ * filter supplemented packages where we already decided
|
|
|
ecf63f |
+ * to install a different architecture */
|
|
|
ecf63f |
+ if (dqs.count && pool->implicitobsoleteusescolors)
|
|
|
ecf63f |
+ {
|
|
|
ecf63f |
+ for (i = j = 0; i < dqs.count; i++)
|
|
|
ecf63f |
+ {
|
|
|
ecf63f |
+ Id p2, pp2;
|
|
|
ecf63f |
+ p = dqs.elements[i];
|
|
|
ecf63f |
+ s = pool->solvables + p;
|
|
|
ecf63f |
+ FOR_PROVIDES(p2, pp2, s->name)
|
|
|
ecf63f |
+ if (solv->decisionmap[p2] > 0 && pool->solvables[p2].name == s->name && pool->solvables[p2].arch != s->arch)
|
|
|
ecf63f |
+ break;
|
|
|
ecf63f |
+ if (p2)
|
|
|
ecf63f |
+ continue; /* ignore this package */
|
|
|
ecf63f |
+ dqs.elements[j++] = p;
|
|
|
ecf63f |
+ }
|
|
|
ecf63f |
+ dqs.count = j;
|
|
|
ecf63f |
+ }
|
|
|
ecf63f |
+
|
|
|
ecf63f |
/* make dq contain both recommended and supplemented pkgs */
|
|
|
ecf63f |
if (dqs.count)
|
|
|
ecf63f |
{
|
|
|
ecf63f |
diff --git a/test/testcases/weakdeps/supplements_implicitobsoleteusescolors.t b/test/testcases/weakdeps/supplements_implicitobsoleteusescolors.t
|
|
|
ecf63f |
new file mode 100644
|
|
|
ecf63f |
index 0000000..6de4544
|
|
|
ecf63f |
--- /dev/null
|
|
|
ecf63f |
+++ b/test/testcases/weakdeps/supplements_implicitobsoleteusescolors.t
|
|
|
ecf63f |
@@ -0,0 +1,20 @@
|
|
|
ecf63f |
+repo system 0 empty
|
|
|
ecf63f |
+repo test 0 testtags <inline>
|
|
|
ecf63f |
+#>=Ver: 2.0
|
|
|
ecf63f |
+#>=Pkg: A 1 1 noarch
|
|
|
ecf63f |
+#>=Pkg: B 1 1 x86_64
|
|
|
ecf63f |
+#>=Sup: A
|
|
|
ecf63f |
+#>=Pkg: B 1 1 i686
|
|
|
ecf63f |
+#>=Sup: A
|
|
|
ecf63f |
+#>=Pkg: A2 1 1 noarch
|
|
|
ecf63f |
+#>=Pkg: B2 1 1 x86_64
|
|
|
ecf63f |
+#>=Sup: A2
|
|
|
ecf63f |
+#>=Req: XX
|
|
|
ecf63f |
+#>=Pkg: B2 1 1 i686
|
|
|
ecf63f |
+#>=Sup: A2
|
|
|
ecf63f |
+system x86_64 * system
|
|
|
ecf63f |
+poolflags implicitobsoleteusescolors
|
|
|
ecf63f |
+job install name A
|
|
|
ecf63f |
+
|
|
|
ecf63f |
+nextjob
|
|
|
ecf63f |
+job install name A2
|
|
|
ecf63f |
--
|
|
|
ecf63f |
2.7.4
|
|
|
ecf63f |
|