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

Collapse All | Expand All

(-)portage.py~ (-4 / +9 lines)
Lines 1036-1042 Link Here
1036
			print "!!! This probably means that this ebuild's files must be downloaded"
1036
			print "!!! This probably means that this ebuild's files must be downloaded"
1037
			print "!!! manually.  See the comments in the ebuild for more information."
1037
			print "!!! manually.  See the comments in the ebuild for more information."
1038
			print
1038
			print
1039
			spawn("/usr/sbin/ebuild.sh nofetch")
1039
			spawn(ebuild_sh+"nofetch")
1040
			return 0
1040
			return 0
1041
		return 1
1041
		return 1
1042
	locations=mymirrors[:]
1042
	locations=mymirrors[:]
Lines 1223-1229 Link Here
1223
			if retval:
1223
			if retval:
1224
				return retval
1224
				return retval
1225
	# spawn ebuild.sh
1225
	# spawn ebuild.sh
1226
	mycommand="/usr/sbin/ebuild.sh "
1226
	mycommand=ebuild_sh
1227
	return spawn(mycommand + mydo,debug,
1227
	return spawn(mycommand + mydo,debug,
1228
				actionmap[mydo]["args"][0],
1228
				actionmap[mydo]["args"][0],
1229
				actionmap[mydo]["args"][1]
1229
				actionmap[mydo]["args"][1]
Lines 1311-1317 Link Here
1311
1311
1312
	# get possible slot information from the deps file
1312
	# get possible slot information from the deps file
1313
	if mydo=="depend":
1313
	if mydo=="depend":
1314
		myso=getstatusoutput("/usr/sbin/ebuild.sh depend")
1314
		myso=getstatusoutput(ebuild_sh+"depend")
1315
		if debug:
1315
		if debug:
1316
			print myso[1]
1316
			print myso[1]
1317
		return myso[0]
1317
		return myso[0]
Lines 1378-1384 Link Here
1378
	
1378
	
1379
	# if any of these are being called, handle them -- running them out of the sandbox -- and stop now.
1379
	# if any of these are being called, handle them -- running them out of the sandbox -- and stop now.
1380
	if mydo in ["help","clean","setup","prerm","postrm","preinst","postinst","config"]:
1380
	if mydo in ["help","clean","setup","prerm","postrm","preinst","postinst","config"]:
1381
		return spawn("/usr/sbin/ebuild.sh "+mydo,debug,free=1)
1381
		return spawn(ebuild_sh+mydo,debug,free=1)
1382
	
1382
	
1383
	try: 
1383
	try: 
1384
		settings["SLOT"], settings["RESTRICT"], myuris = db["/"]["porttree"].dbapi.aux_get(mykey,["SLOT","RESTRICT","SRC_URI"])
1384
		settings["SLOT"], settings["RESTRICT"], myuris = db["/"]["porttree"].dbapi.aux_get(mykey,["SLOT","RESTRICT","SRC_URI"])
Lines 4476-4481 Link Here
4476
#,"porttree":portagetree(root,virts),"bintree":binarytree(root,virts)}
4476
#,"porttree":portagetree(root,virts),"bintree":binarytree(root,virts)}
4477
features=settings["FEATURES"].split()
4477
features=settings["FEATURES"].split()
4478
4478
4479
ebuild_sh="/usr/lib/colorgcc/bin/ebuild.sh"
4480
if (not "colorgcc" in features) or (not os.path.exists(ebuild_sh)):
4481
    ebuild_sh = "/usr/sbin/ebuild.sh"
4482
ebuild_sh += " "
4483
4479
# Defaults set at the top of perform_checksum.
4484
# Defaults set at the top of perform_checksum.
4480
if spawn("/usr/sbin/prelink --version > /dev/null 2>&1",free=1) == 0:
4485
if spawn("/usr/sbin/prelink --version > /dev/null 2>&1",free=1) == 0:
4481
	prelink_capable=1
4486
	prelink_capable=1

Return to bug 2679