Make config.load_infodir also load the data into the env layer in order to ensure...

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

diff --git a/pym/portage.py b/pym/portage.py
index a7201139eda256942347c19bf874f3fa08c79937..94de3fc0285c70e25001a3d1829927332a583363 100644 (file)
--- 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