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 1R27Du-0003S6-GP for garchives@archives.gentoo.org; Fri, 09 Sep 2011 19:58:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4374421C176; Fri, 9 Sep 2011 19:58:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0C04D21C176 for ; Fri, 9 Sep 2011 19:58:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A9B31B401C for ; Fri, 9 Sep 2011 19:58:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9EE6480042 for ; Fri, 9 Sep 2011 19:58:41 +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: <21330075f07248765016e104b3ba8216903f1ecb.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 21330075f07248765016e104b3ba8216903f1ecb Date: Fri, 9 Sep 2011 19:58:41 +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: 5fac758cb63c4e48db0a5d27746b9a38 commit: 21330075f07248765016e104b3ba8216903f1ecb Author: Zac Medico gentoo org> AuthorDate: Fri Sep 9 19:58:27 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Sep 9 19:58:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D21330075 depgraph: pull in new virtual slots with --update Previously, the virtual cost minimization code from bug #141118 would prevent virtual dependencies from pulling in new slots. That behavior was not desired for --update, so now it's fixed to pull in the latest slot available. This allows virtual/jdk-1.7.0 to be pulled in by dependencies when --update is enabled. --- pym/_emerge/depgraph.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index de7bd4a..d6728c1 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6567,8 +6567,14 @@ class _dep_check_composite_db(dbapi): continue self._cpv_pkg_map[pkg.cpv] =3D pkg ret.append(pkg.cpv) - if ret: + + if len(ret) > 1: self._cpv_sort_ascending(ret) + if "--update" in self._depgraph._frozen_config.myopts: + # With --update, we want to force selection of + # the highest available version. + ret =3D [ret[-1]] + self._match_cache[atom] =3D ret return ret[:] =20