From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 73D2C1381F3 for ; Wed, 19 Jun 2013 21:07:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43CDDE09F4; Wed, 19 Jun 2013 21:07:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB719E09F4 for ; Wed, 19 Jun 2013 21:07:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2C2533BF0D for ; Wed, 19 Jun 2013 21:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6A0E0E468F for ; Wed, 19 Jun 2013 21:07:42 +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: <1371676037.f74f301e869b3cac9060a1f35b89df673805c08a.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: f74f301e869b3cac9060a1f35b89df673805c08a X-VCS-Branch: master Date: Wed, 19 Jun 2013 21:07:42 +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-Archives-Salt: 04ec7607-5ea4-4e2b-9dae-0ca88ff6f2c0 X-Archives-Hash: 677305e9a50280ec42257d826492dc8f commit: f74f301e869b3cac9060a1f35b89df673805c08a Author: Zac Medico gentoo org> AuthorDate: Wed Jun 19 21:07:17 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 19 21:07:17 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f74f301e depgraph: fix installed/newuse logic more The matched_pkgs_ignore_use logic, introduced in commit dc8d70479dfb54a1f2561ba3fe82d7a62d97964f, is questionable because we need to ensure that an installed package can be selected if there are no other available packages that match a given USE-dep. --- pym/_emerge/depgraph.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3c52159..b2d79a8 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4642,7 +4642,6 @@ class depgraph(object): vardb = self._frozen_config.roots[root].trees["vartree"].dbapi # List of acceptable packages, ordered by type preference. matched_packages = [] - matched_pkgs_ignore_use = [] highest_version = None if not isinstance(atom, portage.dep.Atom): atom = portage.dep.Atom(atom) @@ -4824,7 +4823,6 @@ class depgraph(object): if atom.use: - matched_pkgs_ignore_use.append(pkg) if autounmask_level and autounmask_level.allow_use_changes and not pkg.built: target_use = {} for flag in atom.use.enabled: @@ -4916,8 +4914,7 @@ class depgraph(object): # Compare built package to current config and # reject the built package if necessary. if built and not useoldpkg and \ - (not installed or - any(other_pkg != pkg for other_pkg in matched_pkgs_ignore_use)) and \ + (not installed or matched_packages) and \ not (installed and self._frozen_config.excluded_pkgs.findAtomForPackage(pkg, modified_use=self._pkg_use_enabled(pkg))) and \