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 1QXh6W-0002OY-TU for garchives@archives.gentoo.org; Fri, 17 Jun 2011 22:01:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE08E1C07B; Fri, 17 Jun 2011 22:01:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8C28C1C07B for ; Fri, 17 Jun 2011 22:01:20 +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 075481B4023 for ; Fri, 17 Jun 2011 22:01:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 66FC88003C for ; Fri, 17 Jun 2011 22:01:19 +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: 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: cbe44d92ff13b8a22f5b4215b73078ce600c6bf4 Date: Fri, 17 Jun 2011 22:01:19 +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: fa995d021672a36459b628a672fa918c commit: cbe44d92ff13b8a22f5b4215b73078ce600c6bf4 Author: Zac Medico gentoo org> AuthorDate: Fri Jun 17 21:58:37 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 17 21:58:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dcbe44d92 misspell-suggestions: filter the input cp Obviously, we don't want to consider the input cp as a possible suggestion, as reported in bug 372033. --- 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 773a256..80409b0 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3110,6 +3110,8 @@ class depgraph(object): all_cp.update(portdb.cp_all()) if "--usepkg" in self._frozen_config.myopts: all_cp.update(bindb.cp_all()) + # discard dir containing no ebuilds + all_cp.discard(cp) =20 orig_cp_map =3D {} for cp_orig in all_cp: @@ -3120,8 +3122,12 @@ class depgraph(object): matches =3D difflib.get_close_matches(cp, all_cp) else: pkg_to_cp =3D {} - for other_cp in all_cp: + 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 pkg_to_cp.setdefault(other_pkg, set()).add(other_cp) pkg_matches =3D difflib.get_close_matches(pkg, pkg_to_cp) matches =3D []