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

svn path=/main/branches/2.1.2/; revision=6359

diff --git a/pym/portage.py b/pym/portage.py
index 9ccd52c117a4a10e40ec48655ca4a95f6aac95b6..b61b4e22f855cfe78cc78ff69f0018e8eb54e167 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1621,6 +1621,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)