Attachment #152883 for bug #221755




			return (newfile, StringIO.StringIO())

def getconfig(mycfg, tolerant=0, allow_sourcing=False, expand=True):
	if isinstance(expand, dict):
		# Some existing variable definitions have been
		# passed in, for use in substitutions.
		expand_map = expand
		expand = True
	else:
		expand_map = {}
	mykeys = {}
	try:
		f=open(mycfg,'r')
	except IOError, e:

				else:
					return mykeys
			if expand:
				mykeys[key] = varexpand(val, expand_map)
				expand_map[key] = mykeys[key]
			else:
				mykeys[key] = val
	except SystemExit, e:

Lines 1440-1447 Link Here

(-)pym/portage.py (-2 / +4 lines)
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	expand_map = {}
1444	for x in self.profiles]	1444	mygcfg_dlists = [getconfig(os.path.join(x, "make.defaults"),
		1445	expand=expand_map) for x in self.profiles]
		1446
1445	for cfg in mygcfg_dlists:	1447	for cfg in mygcfg_dlists:
1446	if cfg:	1448	if cfg:
1447	self.make_defaults_use.append(cfg.get("USE", ""))	1449	self.make_defaults_use.append(cfg.get("USE", ""))

Return to bug 221755

Lines 306-312 Link Here

(-)pym/portage_util.py (-2 / +10 lines)
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	expand_map = expand
		313	expand = True
		314	else:
		315	expand_map = {}
		316	mykeys = {}
310	try:	317	try:
311	f=open(mycfg,'r')	318	f=open(mycfg,'r')
312	except IOError, e:	319	except IOError, e:
Lines 365-371 Link Here
365	else:	372	else:
366	return mykeys	373	return mykeys
367	if expand:	374	if expand:
368	mykeys[key] = varexpand(val, mykeys)	375	mykeys[key] = varexpand(val, expand_map)
		376	expand_map[key] = mykeys[key]
369	else:	377	else:
370	mykeys[key] = val	378	mykeys[key] = val
371	except SystemExit, e:	379	except SystemExit, e: