Attachment #101500 for bug #153993

View | Details | Raw Unified | Return to bug 153993
Collapse All | Expand All




	fns.sort()
	templist = []
	for x in fns:
		if len(x) < 3:
			continue
		if not x[0].isdigit() or not x[1].isdigit():
			continue

		mylist = []
		for myconfig in config_list:
			if var in myconfig:
				mylist.extend(filter(None, myconfig[var].split()))
				del myconfig[var] # prepare for env.update(myconfig)
		if mylist:
			env[var] = " ".join(mylist)

		mylist = []
		for myconfig in config_list:
			if var in myconfig:
				mylist.extend(filter(None, myconfig[var].split(":")))
				del myconfig[var] # prepare for env.update(myconfig)
		if mylist:
			env[var] = ":".join(mylist)

Lines 3-9 Link Here

(-)pym/cache/util.py (-1 / +18 lines)
3	# License: GPL2	3	# License: GPL2
4	# $Id$	4	# $Id$
5		5
6	import cache_errors	6	if not hasattr(__builtins__, "set"):
		7	from sets import Set as set
		8	from itertools import chain
		9	from cache import cache_errors
7		10
8	def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None, verbose_instance=None):	11	def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None, verbose_instance=None):
9		12
Lines 33-38 Link Here
33	del e	36	del e
34	continue	37	continue
35	write_it = True	38	write_it = True
		39	trg = None
36	try:	40	try:
37	trg = trg_cache[x]	41	trg = trg_cache[x]
38	if long(trg["_mtime_"]) == long(entry["_mtime_"]) and eclass_cache.is_eclass_data_valid(trg["_eclasses_"]):	42	if long(trg["_mtime_"]) == long(entry["_mtime_"]) and eclass_cache.is_eclass_data_valid(trg["_eclasses_"]):
Lines 40-45 Link Here
40	except (cache_errors.CacheError, KeyError):	44	except (cache_errors.CacheError, KeyError):
41	pass	45	pass
42		46
		47	if trg and not write_it:
		48	""" We don't want to skip the write unless we're really sure that
		49	the existing cache is identical, so don't trust _mtime_ and
		50	_eclasses_ alone."""
		51	for d in (entry, trg):
		52	if "EAPI" in d and d["EAPI"] in ("", "0"):
		53	del d["EAPI"]
		54	for k in set(chain(entry, trg)).difference(
		55	("_mtime_", "_eclasses_")):
		56	if trg.get(k, "") != entry.get(k, ""):
		57	write_it = True
		58	break
		59
43	if write_it:	60	if write_it:
44	try:	61	try:
45	inherited = entry.get("INHERITED", None)	62	inherited = entry.get("INHERITED", None)

Lines 1493-1500 Link Here

(-)bin/ebuild.sh (-2 / +2 lines)
1493	#syntax from getting expanded :)	1493	#syntax from getting expanded :)
1494	#check eclass rdepends also.	1494	#check eclass rdepends also.
1495	set -f	1495	set -f
1496	if [ "${RDEPEND-unset}" == "unset" ] && [ "${E_RDEPEND-unset}" == "unset" ] ; then	1496	if [ "${RDEPEND-unset}" == "unset" ] ; then
1497	export RDEPEND="${DEPEND} ${E_DEPEND}"	1497	export RDEPEND=${DEPEND}
1498	debug-print "RDEPEND: not set... Setting to: ${DEPEND}"	1498	debug-print "RDEPEND: not set... Setting to: ${DEPEND}"
1499	fi	1499	fi
1500		1500

Return to bug 153993

Lines 465-471 Link Here

(-)pym/portage.py (-3 / +3 lines)
465	fns.sort()	465	fns.sort()
466	templist = []	466	templist = []
467	for x in fns:	467	for x in fns:
468	if len(x) <= 3:	468	if len(x) < 3:
469	continue	469	continue
470	if not x[0].isdigit() or not x[1].isdigit():	470	if not x[0].isdigit() or not x[1].isdigit():
471	continue	471	continue
Lines 509-515 Link Here
509	mylist = []	509	mylist = []
510	for myconfig in config_list:	510	for myconfig in config_list:
511	if var in myconfig:	511	if var in myconfig:
512	mylist.extend(myconfig[var].split())	512	mylist.extend(filter(None, myconfig[var].split()))
513	del myconfig[var] # prepare for env.update(myconfig)	513	del myconfig[var] # prepare for env.update(myconfig)
514	if mylist:	514	if mylist:
515	env[var] = " ".join(mylist)	515	env[var] = " ".join(mylist)
Lines 519-525 Link Here
519	mylist = []	519	mylist = []
520	for myconfig in config_list:	520	for myconfig in config_list:
521	if var in myconfig:	521	if var in myconfig:
522	mylist.extend(myconfig[var].split(":"))	522	mylist.extend(filter(None, myconfig[var].split(":")))
523	del myconfig[var] # prepare for env.update(myconfig)	523	del myconfig[var] # prepare for env.update(myconfig)
524	if mylist:	524	if mylist:
525	env[var] = ":".join(mylist)	525	env[var] = ":".join(mylist)