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 1S9fT3-0004g2-8P for garchives@archives.gentoo.org; Mon, 19 Mar 2012 16:29:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A890AE0B12; Mon, 19 Mar 2012 16:29:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 79C9FE0B09 for ; Mon, 19 Mar 2012 16:29: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 E38C01B4035 for ; Mon, 19 Mar 2012 16:29:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 82E01E5403 for ; Mon, 19 Mar 2012 16:29: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: <1332174569.884993c7f4b9e7e9ede690f5fab81742915fc942.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: 884993c7f4b9e7e9ede690f5fab81742915fc942 X-VCS-Branch: master Date: Mon, 19 Mar 2012 16:29: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: bd6790cb-104f-4f28-87a0-f386998efa42 X-Archives-Hash: 73c6013bf49450787e3404009c8f7435 commit: 884993c7f4b9e7e9ede690f5fab81742915fc942 Author: Zac Medico gentoo org> AuthorDate: Mon Mar 19 16:29:29 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Mar 19 16:29:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D884993c7 depgraph: reset pkgsettings after setcpv This should prevent doebuild_environment from incorrectly using the CATEGORY from the previous setcpv call, as reported in bug #408817. --- pym/_emerge/depgraph.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e4310b4..4d1bc33 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4075,6 +4075,7 @@ class depgraph(object): forced_flags =3D set() forced_flags.update(pkgsettings.useforce) forced_flags.update(pkgsettings.usemask) + pkgsettings.reset() cur_iuse =3D iuses if myeb and not usepkgonly and not useoldpkg: cur_iuse =3D myeb.iuse.all