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 1SPkuo-00039o-EV for garchives@archives.gentoo.org; Thu, 03 May 2012 01:33:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCE34E06B0; Thu, 3 May 2012 01:32:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ADA06E06B0 for ; Thu, 3 May 2012 01:32:49 +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 1E44F1B4027 for ; Thu, 3 May 2012 01:32:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1AD71E5403 for ; Thu, 3 May 2012 01:32:47 +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: <1336008753.e9ba65f66dbc59b89d6133b8a909f58fa41bf760.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: e9ba65f66dbc59b89d6133b8a909f58fa41bf760 X-VCS-Branch: master Date: Thu, 3 May 2012 01:32:47 +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: aab3eba2-9e13-4d2e-be56-50febf4c09f0 X-Archives-Hash: 4bb5de326059d8c8ff38042acdbf666c commit: e9ba65f66dbc59b89d6133b8a909f58fa41bf760 Author: Zac Medico gentoo org> AuthorDate: Thu May 3 01:32:33 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 3 01:32:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De9ba65f6 composite_db._visible: fix AttributeError --- pym/_emerge/depgraph.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e624559..dfc9be9 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6858,7 +6858,7 @@ class _dep_check_composite_db(dbapi): # Note: highest_visible is not necessarily the real highest # visible, especially when --update is not enabled, so use # < operator instead of !=3D. - if pkg < highest_visible: + if highest_visible is not None and pkg < highest_visible: return False elif in_graph !=3D pkg: # Mask choices for packages that would trigger a slot