From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Apr 2007 17:18:22 +0000 (-0000)
Subject: Don't load FEATURES in load_infodir() because FEATURES from the build host shouldn... 
X-Git-Tag: v2.2_pre1~1500
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd321817da58a22f50bb625d3812399261e4549c;p=portage.git

Don't load FEATURES in load_infodir() because FEATURES from the build host shouldn't be interpreted asFEATURES on the client system.  Thanks to Thanks to Chri

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 072262a31..50ef2cc1a 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1627,6 +1627,10 @@ class config:
 			myre = re.compile('^[A-Z]+$')
 			null_byte = "\0"
 			for filename in listdir(infodir,filesonly=1,EmptyOnError=1):
+				if filename == "FEATURES":
+					# FEATURES from the build host shouldn't be interpreted as
+					# FEATURES on the client system.
+					continue
 				if myre.match(filename):
 					try:
 						file_path = os.path.join(infodir, filename)