Don't load FEATURES in load_infodir() because FEATURES from the build host shouldn...

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 072262a31e9215fd11d7fd2b4e62a454f042be07..50ef2cc1a10baffe055e15f9fb08b867c06c94bd 100644 (file)
--- 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)