diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-22 20:39:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-22 20:39:47 +0000 |
| commit | a6e079cdd43f324bdb39ed7ffeefe1b7d44c4edd (patch) | |
| tree | c801d2208e505cca6f69167ccbab1c195ac2149c /pym | |
| parent | 17d4d312fe935e5c603b54206f41632980ee9fdc (diff) | |
| download | portage-a6e079cdd43f324bdb39ed7ffeefe1b7d44c4edd.tar.gz portage-a6e079cdd43f324bdb39ed7ffeefe1b7d44c4edd.tar.bz2 portage-a6e079cdd43f324bdb39ed7ffeefe1b7d44c4edd.zip | |
Make config.load_infodir also load the data into the env layer in order to ensure that it has preference over what may have been there.
svn path=/main/trunk/; revision=4801
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index a7201139e..94de3fc02 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1497,9 +1497,12 @@ class config: mydata = string.strip(open(infodir+"/"+filename).read()) if len(mydata)<2048: if filename == "USE": - self.configdict["pkg"][filename] = "-* "+mydata + binpkg_flags = "-* " + mydata + self.configdict["pkg"][filename] = binpkg_flags + self.configdict["env"][filename] = binpkg_flags else: self.configdict["pkg"][filename] = mydata + self.configdict["env"][filename] = mydata # CATEGORY is important because it's used in doebuild # to infer the cpv. If it's corrupted, it leads to # strange errors later on, so we'll validate it and |