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 1RRDDr-00012O-Ik for garchives@archives.gentoo.org; Fri, 18 Nov 2011 01:26:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38BB821C037; Fri, 18 Nov 2011 01:26:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 04CD321C022 for ; Fri, 18 Nov 2011 01:26:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 612911B4040 for ; Fri, 18 Nov 2011 01:26:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B563580042 for ; Fri, 18 Nov 2011 01:26:18 +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: <458ce208ed25f2d17666926585e14da6166eb9d7.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: 458ce208ed25f2d17666926585e14da6166eb9d7 Date: Fri, 18 Nov 2011 01:26:18 +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: d87697ae-0972-4dd1-894e-1452f4126b0a X-Archives-Hash: bd9f2119769afea92bf45edb2e0af106 commit: 458ce208ed25f2d17666926585e14da6166eb9d7 Author: Zac Medico gentoo org> AuthorDate: Fri Nov 18 01:26:01 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Nov 18 01:26:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D458ce208 depgraph: don't merge portage asap There's no need to do this anymore, because we don't restart since commit d3f704a425a50b5cfa997a25866929b30f1b7d0f. --- pym/_emerge/depgraph.py | 9 --------- pym/portage/tests/resolver/test_merge_order.py | 8 -------- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 65fe1fd..484206e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4996,15 +4996,6 @@ class depgraph(object): if replacement_portage =3D=3D running_portage: replacement_portage =3D None =20 - if replacement_portage is not None and \ - (running_portage is None or \ - running_portage.cpv !=3D replacement_portage.cpv or \ - '9999' in replacement_portage.cpv or \ - 'git' in replacement_portage.inherited or \ - 'git-2' in replacement_portage.inherited): - # update from running_portage to replacement_portage asap - asap_nodes.append(replacement_portage) - if running_portage is not None: try: portage_rdepend =3D self._select_atoms_highest_available( diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index 0a52c81..adff84d 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -410,14 +410,6 @@ class MergeOrderTestCase(TestCase): ["media-video/libav"], success=3DTrue, mergelist =3D ['media-video/libav-0.7_pre20110327', 'media-video/ffm= peg-0.7_rc1', '!media-video/ffmpeg']), - # Test that PORTAGE_PACKAGE_ATOM is merged asap. Optimally, - # satisfied deps are always merged after the asap nodes that - # depend on them. - ResolverPlaygroundTestCase( - ["dev-lang/python", portage.const.PORTAGE_PACKAGE_ATOM], - success =3D True, - all_permutations =3D True, - mergelist =3D ['app-admin/eselect-python-20100321', 'sys-apps/portag= e-2.1.9.49', 'dev-lang/python-3.2']), # Test that OS_HEADERS_PACKAGE_ATOM and LIBC_PACKAGE_ATOM # are merged asap, in order to account for implicit # dependencies. See bug #303567. Optimally, satisfied deps