diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-04-09 17:18:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-09 17:18:22 +0000 |
| commit | dd321817da58a22f50bb625d3812399261e4549c (patch) | |
| tree | c6ed78bd94366cdaac4cb832f9ffc81140c315a2 | |
| parent | 8f808ff79c160676acf986894121acc88f6bb10b (diff) | |
| download | portage-dd321817da58a22f50bb625d3812399261e4549c.tar.gz portage-dd321817da58a22f50bb625d3812399261e4549c.tar.bz2 portage-dd321817da58a22f50bb625d3812399261e4549c.zip | |
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
| -rw-r--r-- | pym/portage/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
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) |