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 1RXLiu-0003nH-Pb for garchives@archives.gentoo.org; Sun, 04 Dec 2011 23:43:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB3E221C05E; Sun, 4 Dec 2011 23:43:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AFA0221C05E for ; Sun, 4 Dec 2011 23:43:49 +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 33C5F1B400C for ; Sun, 4 Dec 2011 23:43:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9C31C80042 for ; Sun, 4 Dec 2011 23:43:48 +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: <3faeebbed6a3613d501c6892e3b6b03d9779fd22.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: 3faeebbed6a3613d501c6892e3b6b03d9779fd22 Date: Sun, 4 Dec 2011 23:43:48 +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: 08f7e186-bac8-404f-bb51-6cf33bdb2a24 X-Archives-Hash: cbec928e7f4f1e0719d5bd18a4c6a0eb commit: 3faeebbed6a3613d501c6892e3b6b03d9779fd22 Author: Zac Medico gentoo org> AuthorDate: Sun Dec 4 23:43:36 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 4 23:43:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3faeebbe depgraph: fix case insensitive search for unsat This fixes an interaction between the code from commits 9ce6da43ab90c4dab97ebf3b8339e5dbc113a0a8 and cbe44d92ff13b8a22f5b4215b73078ce600c6bf4, so that we don't discard matches that are identical except for differnces in upper/lower case. --- pym/_emerge/depgraph.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3bda894..57619e0 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3296,9 +3296,17 @@ class depgraph(object): for other_cp in list(all_cp): other_pkg =3D portage.catsplit(other_cp)[1] if other_pkg =3D=3D pkg: - # discard dir containing no ebuilds - all_cp.discard(other_cp) - continue + # Check for non-identical package that + # differs only by upper/lower case. + identical =3D True + for cp_orig in orig_cp_map[other_cp]: + if cp_orig !=3D cp: + identical =3D False + break + if identical: + # discard dir containing no ebuilds + all_cp.discard(other_cp) + continue pkg_to_cp.setdefault(other_pkg, set()).add(other_cp) pkg_matches =3D difflib.get_close_matches(pkg, pkg_to_cp) matches =3D []