make.globals has no business in profiles
authorMarius Mauch <genone@gentoo.org>
Wed, 10 Jan 2007 04:34:47 +0000 (04:34 -0000)
committerMarius Mauch <genone@gentoo.org>
Wed, 10 Jan 2007 04:34:47 +0000 (04:34 -0000)
svn path=/main/trunk/; revision=5508

pym/portage.py

index 985ee4e79877e90ee7ef92adc91776c1fef90658..056a4c8501f05a5d03a5cc03a5ad35f0853e3417 100644 (file)
@@ -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 = {}