From a6e079cdd43f324bdb39ed7ffeefe1b7d44c4edd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 22 Oct 2006 20:39:47 +0000 Subject: 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 --- pym/portage.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pym') 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 -- cgit v1.2.3-1-g7c22