depgraph: reset pkgsettings after setcpv
authorZac Medico <zmedico@gentoo.org>
Mon, 19 Mar 2012 16:29:29 +0000 (09:29 -0700)
committerZac Medico <zmedico@gentoo.org>
Mon, 19 Mar 2012 16:29:29 +0000 (09:29 -0700)
This should prevent doebuild_environment from incorrectly using the
CATEGORY from the previous setcpv call, as reported in bug #408817.

pym/_emerge/depgraph.py

index e4310b480edcbd2767bc9b5a1976459069ca29ff..4d1bc330e8ad9337e658056bc3ce8febc845f1f8 100644 (file)
@@ -4075,6 +4075,7 @@ class depgraph(object):
                                                forced_flags = set()
                                                forced_flags.update(pkgsettings.useforce)
                                                forced_flags.update(pkgsettings.usemask)
+                                               pkgsettings.reset()
                                                cur_iuse = iuses
                                                if myeb and not usepkgonly and not useoldpkg:
                                                        cur_iuse = myeb.iuse.all