From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 25 Aug 2010 06:31:57 +0000 (-0700)
Subject: When parsing package.env, pass the same tolerant and allow_sourcing
X-Git-Tag: v2.2_rc70~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0452d2293d46141d0746f845f7dcfacdab03302a;p=portage.git

When parsing package.env, pass the same tolerant and allow_sourcing
arguments to getconfig() that are used when parsing make.conf.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 8bea4af98..1ae95b0fe 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -356,6 +356,7 @@ class config(object):
 		# from 'import portage' or 'import portage.exceptions' statements
 		# can practically render the api unusable for api consumers.
 		tolerant = hasattr(portage, '_initializing_globals')
+		self._tolerant = tolerant
 
 		self.already_in_regenerate = 0
 
@@ -393,6 +394,7 @@ class config(object):
 		if clone:
 			# For immutable attributes, use shallow copy for
 			# speed and memory conservation.
+			self._tolerant = clone._tolerant
 			self.categories = clone.categories
 			self.depcachedir = clone.depcachedir
 			self.incrementals = clone.incrementals
@@ -1718,7 +1720,8 @@ class config(object):
 		incrementals = self.incrementals
 		for envname in penv:
 			penvfile = os.path.join(abs_user_config, "env", envname)
-			penvconfig = getconfig(penvfile, expand=expand_map)
+			penvconfig = getconfig(penvfile, tolerant=self._tolerant,
+				allow_sourcing=True, expand=expand_map)
 			if penvconfig is None:
 				writemsg("!!! %s references non-existent file: %s\n" % \
 					(os.path.join(abs_user_config, 'package.env'), penvfile),