From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QNdCA-0005eG-Mk for garchives@archives.gentoo.org; Sat, 21 May 2011 03:49:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32ECB1C00C; Sat, 21 May 2011 03:49:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DE1B91C00C for ; Sat, 21 May 2011 03:49:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 384BD1B4008 for ; Sat, 21 May 2011 03:49:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 501408001E for ; Sat, 21 May 2011 03:49:33 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <037ef49ed8763eba774a8e69f9b060793cbb7d68.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py pym/portage/tests/resolver/test_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 037ef49ed8763eba774a8e69f9b060793cbb7d68 Date: Sat, 21 May 2011 03:49:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 71ec7f8b0bc3c33d580084896be14d4c commit: 037ef49ed8763eba774a8e69f9b060793cbb7d68 Author: Zac Medico gentoo org> AuthorDate: Sat May 21 03:49:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 03:49:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D037ef49e test_merge_order: test hard blocker resolution --- pym/_emerge/depgraph.py | 3 +-- pym/portage/tests/resolver/test_merge_order.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 4789a0c..3ef47f8 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5531,8 +5531,7 @@ class depgraph(object): =20 msg.append("\n") =20 - sys.stderr.write("".join(msg)) - sys.stderr.flush() + writemsg("".join(msg), noiselevel=3D-1) =20 if "--quiet" not in self._frozen_config.myopts: show_blocker_docs_link() diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index 6c929f7..e7f1aa4 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -11,6 +11,7 @@ class MergeOrderTestCase(TestCase): ebuilds =3D { "app-misc/blocker-buildtime-a-1" : {}, "app-misc/blocker-runtime-a-1" : {}, + "app-misc/blocker-runtime-hard-a-1" : {}, "app-misc/circ-post-runtime-a-1": { "PDEPEND": "app-misc/circ-post-runtime-b", }, @@ -24,8 +25,9 @@ class MergeOrderTestCase(TestCase): "RDEPEND": "app-misc/circ-runtime-a", }, "app-misc/installed-blocker-a-1" : { + "EAPI" : "2", "DEPEND" : "!app-misc/blocker-buildtime-a", - "RDEPEND" : "!app-misc/blocker-runtime-a", + "RDEPEND" : "!app-misc/blocker-runtime-a !!app-misc/blocker-runtime-= hard-a", }, "app-misc/some-app-a-1": { "RDEPEND": "app-misc/circ-runtime-a app-misc/circ-runtime-b", @@ -37,9 +39,10 @@ class MergeOrderTestCase(TestCase): =20 installed =3D { "app-misc/installed-blocker-a-1" : { + "EAPI" : "2", "DEPEND" : "!app-misc/blocker-buildtime-a", - "RDEPEND" : "!app-misc/blocker-runtime-a", - } + "RDEPEND" : "!app-misc/blocker-runtime-a !!app-misc/blocker-runtime-= hard-a", + }, } =20 test_cases =3D ( @@ -72,6 +75,13 @@ class MergeOrderTestCase(TestCase): ["app-misc/blocker-runtime-a"], success =3D True, mergelist =3D ["app-misc/blocker-runtime-a-1", "app-misc/installed-b= locker-a-1", "!app-misc/blocker-runtime-a"]), + # An installed package has a hard runtime blocker that + # will not resolve automatically (unless the option + # requested in bug 250286 is implemented). + ResolverPlaygroundTestCase( + ["app-misc/blocker-runtime-hard-a"], + success =3D False, + mergelist =3D ['app-misc/blocker-runtime-hard-a-1', '!!app-misc/bloc= ker-runtime-hard-a']), ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled)