diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-04-09 17:20:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-09 17:20:00 +0000 |
| commit | dd42a8655f7f60d538f1cc480c530ebfde339bdf (patch) | |
| tree | 02b94d8dc3aa5db95d9dfdaf9a98bb93fac390c2 /pym | |
| parent | 2552e4fe5e2bb58fda08fdeffbca278c26ed7a1a (diff) | |
| download | portage-dd42a8655f7f60d538f1cc480c530ebfde339bdf.tar.gz portage-dd42a8655f7f60d538f1cc480c530ebfde339bdf.tar.bz2 portage-dd42a8655f7f60d538f1cc480c530ebfde339bdf.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/branches/2.1.2/; revision=6359
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index 9ccd52c11..b61b4e22f 100644 --- 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) |