Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Mon, 19 Mar 2012 16:29:57
Message-Id: 1332174569.884993c7f4b9e7e9ede690f5fab81742915fc942.zmedico@gentoo
1 commit: 884993c7f4b9e7e9ede690f5fab81742915fc942
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 19 16:29:29 2012 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 19 16:29:29 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=884993c7
7
8 depgraph: reset pkgsettings after setcpv
9
10 This should prevent doebuild_environment from incorrectly using the
11 CATEGORY from the previous setcpv call, as reported in bug #408817.
12
13 ---
14 pym/_emerge/depgraph.py | 1 +
15 1 files changed, 1 insertions(+), 0 deletions(-)
16
17 diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
18 index e4310b4..4d1bc33 100644
19 --- a/pym/_emerge/depgraph.py
20 +++ b/pym/_emerge/depgraph.py
21 @@ -4075,6 +4075,7 @@ class depgraph(object):
22 forced_flags = set()
23 forced_flags.update(pkgsettings.useforce)
24 forced_flags.update(pkgsettings.usemask)
25 + pkgsettings.reset()
26 cur_iuse = iuses
27 if myeb and not usepkgonly and not useoldpkg:
28 cur_iuse = myeb.iuse.all