From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 11 Jul 2008 05:12:00 +0000 (-0000)
Subject: Call settings.reset() in EbuildMetadataPhase.start() since that's what
X-Git-Tag: v2.2_rc2~129
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=546f70bba80a0f4db6a775f2750f57874da493ba;p=portage.git

Call settings.reset() in EbuildMetadataPhase.start() since that's what
portdbapi does too before generating metadata, and without it, a previous
CATEGORY can leak into the ebuild env and corrupt it (breaks lots of packages
that reference $CATEGORY).

svn path=/main/trunk/; revision=11015
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index dce4ef8d8..bde6d5cbe 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2312,6 +2312,7 @@ class EbuildMetadataPhase(SubProcess):
 
 	def start(self):
 		settings = self.settings
+		settings.reset()
 		ebuild_path = self.ebuild_path
 		debug = settings.get("PORTAGE_DEBUG") == "1"
 		master_fd = None