diff options
| author | Marius Mauch <genone@gentoo.org> | 2007-01-10 04:34:47 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2007-01-10 04:34:47 +0000 |
| commit | 23d51c61186ae10926f09ed152ff7ae84a9ca45a (patch) | |
| tree | 789a1fd288834a09d2ad676ca077bcfc44d25b09 | |
| parent | c53f52941c88b24c20204f1795dc02f595ee3a57 (diff) | |
| download | portage-23d51c61186ae10926f09ed152ff7ae84a9ca45a.tar.gz portage-23d51c61186ae10926f09ed152ff7ae84a9ca45a.tar.bz2 portage-23d51c61186ae10926f09ed152ff7ae84a9ca45a.zip | |
make.globals has no business in profiles
svn path=/main/trunk/; revision=5508
| -rw-r--r-- | pym/portage.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index 985ee4e79..056a4c850 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1127,9 +1127,7 @@ class config: del rawpuseforce try: - mygcfg_dlists = [getconfig(os.path.join(x, "make.globals")) \ - for x in self.profiles + [os.path.join(config_root, "etc")]] - self.mygcfg = stack_dicts(mygcfg_dlists, incrementals=portage_const.INCREMENTALS, ignore_none=1) + self.mygcfg = getconfig(os.path.join(config_root, "etc", "make.globals")) if self.mygcfg is None: self.mygcfg = {} |