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 1QfuAT-0003Fp-VK for garchives@archives.gentoo.org; Sun, 10 Jul 2011 13:35:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7FCA21C054; Sun, 10 Jul 2011 13:35:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9608E21C054 for ; Sun, 10 Jul 2011 13:35:21 +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 ED2A31B400D for ; Sun, 10 Jul 2011 13:35:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0FBFA8003D for ; Sun, 10 Jul 2011 13:35:20 +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: c36a0214d9690f893341d199a834c8ffc506d5bd Date: Sun, 10 Jul 2011 13:35:20 +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: 34ba8cfb10ade7c99b6ecdd6bef2554c commit: c36a0214d9690f893341d199a834c8ffc506d5bd Author: Zac Medico gentoo org> AuthorDate: Sun Jul 10 13:33:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jul 10 13:33:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc36a0214 circular_dependency: fix total_flags calc --- pym/_emerge/resolver/circular_dependency.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/re= solver/circular_dependency.py index e4d679f..d113c5e 100644 --- a/pym/_emerge/resolver/circular_dependency.py +++ b/pym/_emerge/resolver/circular_dependency.py @@ -152,9 +152,9 @@ class circular_dependency_handler(object): # exponentially related (see bug #374397). total_flags =3D set() total_flags.update(affecting_use, required_use_flags) + total_flags.difference_update(untouchable_flags) if len(total_flags) <=3D 10: - affecting_use.update(required_use_flags) - affecting_use.difference_update(untouchable_flags) + affecting_use =3D total_flags =20 affecting_use =3D tuple(affecting_use) =20