From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 29 Jun 2008 15:08:37 +0000 (-0000)
Subject: Add EMERGE_FROM to the blacklisted vars in the config constructor.
X-Git-Tag: v2.2_rc2~275
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37603356fa89c3597858ef8f558f43fa7bc12408;p=portage.git

Add EMERGE_FROM to the blacklisted vars in the config constructor.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1f0003326..922c620b6 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1398,7 +1398,7 @@ class config(object):
 
 			# Blacklist vars that could interfere with portage internals.
 			for blacklisted in "CATEGORY", "EBUILD_PHASE", \
-				"PKGUSE", "PORTAGE_CONFIGROOT", \
+				"EMERGE_FROM", "PKGUSE", "PORTAGE_CONFIGROOT", \
 				"PORTAGE_IUSE", "PORTAGE_USE", "ROOT":
 				for cfg in self.lookuplist:
 					cfg.pop(blacklisted, None)