summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-11 05:12:00 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-11 05:12:00 +0000
commit546f70bba80a0f4db6a775f2750f57874da493ba (patch)
tree004703f1a416e78390ae179485a0fa73795b7f7e
parent1550325ca1c4d51a878ce0a5fcaff6257c479974 (diff)
downloadportage-546f70bba80a0f4db6a775f2750f57874da493ba.tar.gz
portage-546f70bba80a0f4db6a775f2750f57874da493ba.tar.bz2
portage-546f70bba80a0f4db6a775f2750f57874da493ba.zip
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
-rw-r--r--pym/_emerge/__init__.py1
1 files changed, 1 insertions, 0 deletions
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