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 1RNU1y-0007JS-4U for garchives@archives.gentoo.org; Mon, 07 Nov 2011 18:34:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2458D21C086; Mon, 7 Nov 2011 18:34:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E154121C086 for ; Mon, 7 Nov 2011 18:34:41 +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 5287C1B402D for ; Mon, 7 Nov 2011 18:34:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AC5BF80042 for ; Mon, 7 Nov 2011 18:34:40 +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/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/circular_dependency.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c88e394bfeafa16ac5dc75232b9b9b139f76e59c Date: Mon, 7 Nov 2011 18:34:40 +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: 7f2540de-3b81-47a8-90e3-07d3e2e0764e X-Archives-Hash: 166a8ecac934a11f389ce3f584526bd6 commit: c88e394bfeafa16ac5dc75232b9b9b139f76e59c Author: Zac Medico gentoo org> AuthorDate: Mon Nov 7 18:33:47 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Nov 7 18:34:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc88e394b Fix breakage from last commit. --- pym/_emerge/resolver/circular_dependency.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/re= solver/circular_dependency.py index 62d5556..aca81fa 100644 --- a/pym/_emerge/resolver/circular_dependency.py +++ b/pym/_emerge/resolver/circular_dependency.py @@ -186,7 +186,7 @@ class circular_dependency_handler(object): parent_atom not in reduced_dep: #We found an assignment that removes the atom from 'dep'. #Make sure it doesn't conflict with REQUIRED_USE. - required_use =3D parent.metadata.get("REQUIRED_USE", "")] + required_use =3D parent.metadata.get("REQUIRED_USE", "") =20 if check_required_use(required_use, current_use, parent.iuse.is_val= id_flag): use =3D self.depgraph._pkg_use_enabled(parent)