1 |
commit: c1671591dc2b46038c871f9038ff4cb46dccc160 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 2 17:28:45 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 2 17:32:36 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c1671591 |
7 |
|
8 |
MergeOrderTestCase: fix x11-drivers/xf86-video-fbdev slot operator deps |
9 |
|
10 |
The real ebuild has the x11-base/xorg-server:= dependency in RDEPEND |
11 |
rather than DEPEND. |
12 |
|
13 |
Fixes: 07a604537e74 ("find_smallest_cycle: don't merge satisfied PDEPEND too early") |
14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
15 |
|
16 |
lib/portage/tests/resolver/test_merge_order.py | 8 ++++---- |
17 |
1 file changed, 4 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/lib/portage/tests/resolver/test_merge_order.py b/lib/portage/tests/resolver/test_merge_order.py |
20 |
index 0510a0636..db063ed9d 100644 |
21 |
--- a/lib/portage/tests/resolver/test_merge_order.py |
22 |
+++ b/lib/portage/tests/resolver/test_merge_order.py |
23 |
@@ -231,8 +231,8 @@ class MergeOrderTestCase(TestCase): |
24 |
}, |
25 |
"x11-drivers/xf86-video-fbdev-0.5.0-r1": { |
26 |
"EAPI": "7", |
27 |
- "DEPEND": "x11-base/xorg-server:=", |
28 |
- "RDEPEND": "x11-base/xorg-server", |
29 |
+ "DEPEND": "x11-base/xorg-server", |
30 |
+ "RDEPEND": "x11-base/xorg-server:=", |
31 |
} |
32 |
} |
33 |
|
34 |
@@ -325,8 +325,8 @@ class MergeOrderTestCase(TestCase): |
35 |
}, |
36 |
"x11-drivers/xf86-video-fbdev-0.5.0-r1": { |
37 |
"EAPI": "7", |
38 |
- "DEPEND": "x11-base/xorg-server:0/1.14.1=", |
39 |
- "RDEPEND": "x11-base/xorg-server", |
40 |
+ "DEPEND": "x11-base/xorg-server", |
41 |
+ "RDEPEND": "x11-base/xorg-server:0/1.14.1=", |
42 |
} |
43 |
} |