From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06FBE1382C5 for ; Wed, 2 Dec 2020 17:33:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23DF0E084A; Wed, 2 Dec 2020 17:33:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0866CE084A for ; Wed, 2 Dec 2020 17:33:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8355F340FD5 for ; Wed, 2 Dec 2020 17:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8C3B46F for ; Wed, 2 Dec 2020 17:33:46 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1606930356.c1671591dc2b46038c871f9038ff4cb46dccc160.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/tests/resolver/test_merge_order.py X-VCS-Directories: lib/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c1671591dc2b46038c871f9038ff4cb46dccc160 X-VCS-Branch: master Date: Wed, 2 Dec 2020 17:33:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7704c244-627f-416d-934e-c8fc2f3b9e58 X-Archives-Hash: 36ddc35ec0966e844331b78099a07ae7 commit: c1671591dc2b46038c871f9038ff4cb46dccc160 Author: Zac Medico gentoo org> AuthorDate: Wed Dec 2 17:28:45 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Dec 2 17:32:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c1671591 MergeOrderTestCase: fix x11-drivers/xf86-video-fbdev slot operator deps The real ebuild has the x11-base/xorg-server:= dependency in RDEPEND rather than DEPEND. Fixes: 07a604537e74 ("find_smallest_cycle: don't merge satisfied PDEPEND too early") Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_merge_order.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/portage/tests/resolver/test_merge_order.py b/lib/portage/tests/resolver/test_merge_order.py index 0510a0636..db063ed9d 100644 --- a/lib/portage/tests/resolver/test_merge_order.py +++ b/lib/portage/tests/resolver/test_merge_order.py @@ -231,8 +231,8 @@ class MergeOrderTestCase(TestCase): }, "x11-drivers/xf86-video-fbdev-0.5.0-r1": { "EAPI": "7", - "DEPEND": "x11-base/xorg-server:=", - "RDEPEND": "x11-base/xorg-server", + "DEPEND": "x11-base/xorg-server", + "RDEPEND": "x11-base/xorg-server:=", } } @@ -325,8 +325,8 @@ class MergeOrderTestCase(TestCase): }, "x11-drivers/xf86-video-fbdev-0.5.0-r1": { "EAPI": "7", - "DEPEND": "x11-base/xorg-server:0/1.14.1=", - "RDEPEND": "x11-base/xorg-server", + "DEPEND": "x11-base/xorg-server", + "RDEPEND": "x11-base/xorg-server:0/1.14.1=", } }