Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 221755 | Differences between
and this patch

Collapse All | Expand All

(-)pym/portage_util.py (-1 / +7 lines)
Lines 306-312 Link Here
306
			return (newfile, StringIO.StringIO())
306
			return (newfile, StringIO.StringIO())
307
307
308
def getconfig(mycfg, tolerant=0, allow_sourcing=False, expand=True):
308
def getconfig(mycfg, tolerant=0, allow_sourcing=False, expand=True):
309
	mykeys={}
309
	if isinstance(expand, dict):
310
		# Some existing variable definitions have been
311
		# passed in, for use in substitutions.
312
		mykeys = expand.copy()
313
		expand = True
314
	else:
315
		mykeys = {}
310
	try:
316
	try:
311
		f=open(mycfg,'r')
317
		f=open(mycfg,'r')
312
	except IOError, e:
318
	except IOError, e:
(-)pym/portage.py (-2 / +7 lines)
Lines 1440-1447 Link Here
1440
			self.make_defaults_use = []
1440
			self.make_defaults_use = []
1441
			self.mygcfg = {}
1441
			self.mygcfg = {}
1442
			if self.profiles:
1442
			if self.profiles:
1443
				mygcfg_dlists = [getconfig(os.path.join(x, "make.defaults")) \
1443
				mygcfg_dlists = []
1444
					for x in self.profiles]
1444
				var_map = {}
1445
				for x in self.profiles:
1446
					var_map = getconfig(os.path.join(x, "make.defaults"),
1447
						expand=var_map)
1448
					mygcfg_dlists.append(var_map)
1449
1445
				for cfg in mygcfg_dlists:
1450
				for cfg in mygcfg_dlists:
1446
					if cfg:
1451
					if cfg:
1447
						self.make_defaults_use.append(cfg.get("USE", ""))
1452
						self.make_defaults_use.append(cfg.get("USE", ""))

Return to bug 221755