Attachment #21464 for bug #34700

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

Lines 378-383 Link Here

(-)/usr/lib/portage/bin/ebuild.sh.old (-2 / +23 lines)
378	fi	378	fi
379	}	379	}
380		380
		381	src_compile_continue() {
		382	emake \|\| ERROR="si"
		383	if [ "${ERROR}" == "si" ]; then
		384	echo "!!! make failed, restarting configure."
		385	ERROR=""
		386	CONTINUE=""
		387	dyn_compile
		388	fi
		389	}
		390
381	src_install()	391	src_install()
382	{	392	{
383	return	393	return
Lines 451-456 Link Here
451	pkg_setup \|\| die "pkg_setup function failed; exiting."	461	pkg_setup \|\| die "pkg_setup function failed; exiting."
452	}	462	}
453		463
		464	dyn_continue() {
		465	CONTINUE="yes"
		466	dyn_compile
		467	}
		468
454	dyn_unpack() {	469	dyn_unpack() {
455	trap "abort_unpack" SIGINT SIGQUIT	470	trap "abort_unpack" SIGINT SIGQUIT
456	local newstuff="no"	471	local newstuff="no"
Lines 696-702 Link Here
696	#some packages use an alternative to $S to build in, cause	711	#some packages use an alternative to $S to build in, cause
697	#our libtool to create problematic .la files	712	#our libtool to create problematic .la files
698	export PWORKDIR="$WORKDIR"	713	export PWORKDIR="$WORKDIR"
699	src_compile	714
		715	if [ "${CONTINUE}" == "yes" ]; then
		716	src_compile_continue
		717	else
		718	src_compile
		719	fi
		720
700	#\|\| abort_compile "fail"	721	#\|\| abort_compile "fail"
701	cd ${BUILDDIR}	722	cd ${BUILDDIR}
702	touch .compiled	723	touch .compiled
Lines 1222-1228 Link Here
1222	set +x	1243	set +x
1223	fi	1244	fi
1224	;;	1245	;;
1225	unpack\|compile\|clean\|install)	1246	unpack\|compile\|clean\|install\|continue)
1226	if [ "${SANDBOX_DISABLED="0"}" == "0" ]; then	1247	if [ "${SANDBOX_DISABLED="0"}" == "0" ]; then
1227	export SANDBOX_ON="1"	1248	export SANDBOX_ON="1"
1228	else	1249	else

Lines 54-60 Link Here

(-)/usr/lib/portage/bin/emerge.old (-10 / +28 lines)
54	"--skipfirst",	54	"--skipfirst",
55	"--update", "--upgradeonly",	55	"--update", "--upgradeonly",
56	"--usepkg", "--usepkgonly",	56	"--usepkg", "--usepkgonly",
57	"--verbose", "--version"	57	"--verbose", "--version",
		58	"--continue", "--continue"
58	]	59	]
59		60
60	shortmapping={	61	shortmapping={
Lines 74-80 Link Here
74	"q":"--quiet",	75	"q":"--quiet",
75	"s":"--search", "S":"--searchdesc",	76	"s":"--search", "S":"--searchdesc",
76	"u":"--update", "U":"--upgradeonly",	77	"u":"--update", "U":"--upgradeonly",
77	"v":"--verbose", "V":"--version"	78	"v":"--verbose", "V":"--version",
		79	"Co": "--continue"
78	}	80	}
79		81
80	myaction=None	82	myaction=None
Lines 152-157 Link Here
152	print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both."	154	print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both."
153	sys.exit(1)	155	sys.exit(1)
154		156
		157	if ("--continue" in myopts):
		158	myopts.append("--resume")
		159
155	# Always create packages if FEATURES=buildpkg	160	# Always create packages if FEATURES=buildpkg
156	# Imply --buildpkg if --buildpkgonly	161	# Imply --buildpkg if --buildpkgonly
157	if ("buildpkg" in portage.features) or ("--buildpkgonly" in myopts):	162	if ("buildpkg" in portage.features) or ("--buildpkgonly" in myopts):
Lines 1213-1223 Link Here
1213		1218
1214	if ("--resume" in myopts):	1219	if ("--resume" in myopts):
1215	# We're resuming.	1220	# We're resuming.
1216	print green("*** Resuming merge...")	1221	if ("--continue" in myopts):
1217	emergelog(" *** Resuming merge...")	1222	print green("*** Continuing merge...")
		1223	emergelog(" *** Continuing merge...")
		1224	else:
		1225	print green("*** Resuming merge...")
		1226	emergelog(" *** Resuming merge...")
		1227
1218	mymergelist=portage.mtimedb["resume"]["mergelist"][:]	1228	mymergelist=portage.mtimedb["resume"]["mergelist"][:]
1219	if ("--skipfirst" in myopts) and mymergelist:	1229	if ("--skipfirst" in myopts) and mymergelist:
1220	del mymergelist[0]	1230	del mymergelist[0]
		1231
		1232
1221	else:	1233	else:
1222	myfavs=portage.grabfile(portage.root+"var/cache/edb/world")	1234	myfavs=portage.grabfile(portage.root+"var/cache/edb/world")
1223	myfavdict=genericdict(myfavs)	1235	myfavdict=genericdict(myfavs)
Lines 1289-1301 Link Here
1289	if retval==None:	1301	if retval==None:
1290	sys.exit(1)	1302	sys.exit(1)
1291	else:	1303	else:
1292	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Cleaning ("+y+")")	1304	merge_command="continue"
1293	retval=portage.doebuild(y,"clean",myroot,edebug)	1305	if ("--continue" not in myopts):
1294	if retval:	1306	merge_command="merge"
1295	sys.exit(1)	1307	print (" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Cleaning ("+y+")")
		1308	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Cleaning ("+y+")")
		1309	retval=portage.doebuild(y,"clean",myroot,edebug)
		1310	if retval:
		1311	sys.exit(1)
1296	portage.settings["FEATURES"]=myorigfeat # Put back flags.	1312	portage.settings["FEATURES"]=myorigfeat # Put back flags.
1297	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Compiling/Merging ("+y+")")	1313	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Compiling/Merging ("+y+")")
1298	retval=portage.doebuild(y,"merge",myroot,edebug)	1314
		1315	retval=portage.doebuild(y,merge_command,myroot,edebug)
1299	if retval:	1316	if retval:
1300	sys.exit(1)	1317	sys.exit(1)
1301	#dynamically update our database	1318	#dynamically update our database
Lines 2025-2031 Link Here
2025	if ("--resume" in myopts):	2042	if ("--resume" in myopts):
2026	del myopts[myopts.index("--resume")]	2043	del myopts[myopts.index("--resume")]
2027	print darkgreen("emerge: It seems we have nothing to resume...")	2044	print darkgreen("emerge: It seems we have nothing to resume...")
2028	sys.exit(0)	2045	if ("--continue" not in myopts):
		2046	sys.exit(0)
2029		2047
2030	mydepgraph=depgraph(myaction,myopts)	2048	mydepgraph=depgraph(myaction,myopts)
2031	if myaction in ["system","world"]:	2049	if myaction in ["system","world"]:

Lines 1-7 Link Here

(-)/usr/lib/portage/bin/emergehelp.py.old (-3 / +7 lines)
1	#!/usr/bin/env python2.2	1	#!/usr/bin/env python2.2
2	# Copyright 1999-2003 Gentoo Technologies, Inc.	2	# Copyright 1999-2003 Gentoo Technologies, Inc.
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Header: /home/cvsroot/gentoo-src/portage/bin/emergehelp.py,v 1.16 2003/08/16 07:28:22 carpaski Exp $	4	# $Header: /home/cvsroot/gentoo-src/portage/bin/emergehelp.py,v 1.17 2003/10/06 14:09:43 caleb Exp $
5		5
6	import os,sys	6	import os,sys
7	from output import *	7	from output import *
Lines 129-135 Link Here
129	print " systems (build once, emerge tbz2s everywhere)."	129	print " systems (build once, emerge tbz2s everywhere)."
130	print	130	print
131	print " "+green("--buildpkgonly")+" ("+green("-B")+" short option)"	131	print " "+green("--buildpkgonly")+" ("+green("-B")+" short option)"
132	print " Creates binary a binary package, but does not merge it to the"	132	print " Creates a binary package, but does not merge it to the"
133	print " system. This has the restriction that unsatisfied dependencies"	133	print " system. This has the restriction that unsatisfied dependencies"
134	print " must not exist for the desired package as they cannot be used if"	134	print " must not exist for the desired package as they cannot be used if"
135	print " they do not exist on the system."	135	print " they do not exist on the system."
Lines 141-147 Link Here
141	print " "+green("--columns")	141	print " "+green("--columns")
142	print " Display the pretend output in a tabular form. Versions are"	142	print " Display the pretend output in a tabular form. Versions are"
143	print " aligned vertically."	143	print " aligned vertically."
144	print	144	print
		145	print " "+green("--continue")+" ("+green("-Co")+" short option)"
		146	print " Resume (or pretend to resume) the last merge operation. "
		147	print " '--continue' emit the 'clean' operation, and start from the last 'make' action"
		148	print
145	print " "+green("--debug")+" ("+green("-d")+" short option)"	149	print " "+green("--debug")+" ("+green("-d")+" short option)"
146	print " Tell emerge to run the ebuild command in --debug mode. In this"	150	print " Tell emerge to run the ebuild command in --debug mode. In this"
147	print " mode, the bash build environment will run with the -x option,"	151	print " mode, the bash build environment will run with the -x option,"




	return digestCheckFiles(myfiles, mydigests, basedir, "src_uri")

# parse actionmap to spawn ebuild with the appropriate args
def spawnebuild(mydo,actionmap,debug,alwaysdep=0,continue_flag=0):
	if alwaysdep or ("noauto" not in features):
		# process dependency first
		if "dep" in actionmap[mydo].keys():
			retval=spawnebuild(actionmap[mydo]["dep"],actionmap,debug,alwaysdep,continue_flag)
			if retval:
				return retval
	# spawn ebuild.sh
	mycommand="/usr/sbin/ebuild.sh "

	if ( continue_flag == 1 ) and ( mydo == "compile" ):
		comando = mycommand + "continue"
	else:
		comando= mycommand + mydo
	return spawn(comando,debug,
				actionmap[mydo]["args"][0],
				actionmap[mydo]["args"][1])


	if mydo not in ["help","clean","prerm","postrm","preinst","postinst",
	                "config","touch","setup","depend","fetch","digest",
	                "unpack","compile","install","rpm","qmerge","merge",
	                "package","unmerge", "manifest", "continue"]:
		sys.stderr.write("!!! doebuild: Please specify a valid command.\n");
		return 1
	if not os.path.exists(myebuild):

	elif mydo=="qmerge": 
		#qmerge is specifically not supposed to do a runtime dep check
		return merge(settings["CATEGORY"],settings["PF"],settings["D"],settings["BUILDDIR"]+"/build-info",myroot)
	elif ( mydo == "merge" ) or ( mydo == "continue" ):
		continue_f=0
		if ( mydo == "continue"): continue_f=1
		retval=spawnebuild("install",actionmap,debug,1,continue_f)
		if retval: return retval
		return merge(settings["CATEGORY"],settings["PF"],settings["D"],settings["BUILDDIR"]+"/build-info",myroot,myebuild=settings["EBUILD"])
	else:

Return to bug 34700

Lines 1514-1529 Link Here

(-)/usr/lib/python2.2/site-packages/portage.py.old (-6 / +13 lines)
1514	return digestCheckFiles(myfiles, mydigests, basedir, "src_uri")	1514	return digestCheckFiles(myfiles, mydigests, basedir, "src_uri")
1515		1515
1516	# parse actionmap to spawn ebuild with the appropriate args	1516	# parse actionmap to spawn ebuild with the appropriate args
1517	def spawnebuild(mydo,actionmap,debug,alwaysdep=0):	1517	def spawnebuild(mydo,actionmap,debug,alwaysdep=0,continue_flag=0):
1518	if alwaysdep or ("noauto" not in features):	1518	if alwaysdep or ("noauto" not in features):
1519	# process dependency first	1519	# process dependency first
1520	if "dep" in actionmap[mydo].keys():	1520	if "dep" in actionmap[mydo].keys():
1521	retval=spawnebuild(actionmap[mydo]["dep"],actionmap,debug,alwaysdep)	1521	retval=spawnebuild(actionmap[mydo]["dep"],actionmap,debug,alwaysdep,continue_flag)
1522	if retval:	1522	if retval:
1523	return retval	1523	return retval
1524	# spawn ebuild.sh	1524	# spawn ebuild.sh
1525	mycommand="/usr/sbin/ebuild.sh "	1525	mycommand="/usr/sbin/ebuild.sh "
1526	return spawn(mycommand + mydo,debug,	1526
		1527	if ( continue_flag == 1 ) and ( mydo == "compile" ):
		1528	comando = mycommand + "continue"
		1529	else:
		1530	comando= mycommand + mydo
		1531	return spawn(comando,debug,
1527	actionmap[mydo]["args"][0],	1532	actionmap[mydo]["args"][0],
1528	actionmap[mydo]["args"][1])	1533	actionmap[mydo]["args"][1])
1529		1534
Lines 1532-1538 Link Here
1532	if mydo not in ["help","clean","prerm","postrm","preinst","postinst",	1537	if mydo not in ["help","clean","prerm","postrm","preinst","postinst",
1533	"config","touch","setup","depend","fetch","digest",	1538	"config","touch","setup","depend","fetch","digest",
1534	"unpack","compile","install","rpm","qmerge","merge",	1539	"unpack","compile","install","rpm","qmerge","merge",
1535	"package","unmerge", "manifest"]:	1540	"package","unmerge", "manifest", "continue"]:
1536	sys.stderr.write("!!! doebuild: Please specify a valid command.\n");	1541	sys.stderr.write("!!! doebuild: Please specify a valid command.\n");
1537	return 1	1542	return 1
1538	if not os.path.exists(myebuild):	1543	if not os.path.exists(myebuild):
Lines 1787-1794 Link Here
1787	elif mydo=="qmerge":	1792	elif mydo=="qmerge":
1788	#qmerge is specifically not supposed to do a runtime dep check	1793	#qmerge is specifically not supposed to do a runtime dep check
1789	return merge(settings["CATEGORY"],settings["PF"],settings["D"],settings["BUILDDIR"]+"/build-info",myroot)	1794	return merge(settings["CATEGORY"],settings["PF"],settings["D"],settings["BUILDDIR"]+"/build-info",myroot)
1790	elif mydo=="merge":	1795	elif ( mydo == "merge" ) or ( mydo == "continue" ):
1791	retval=spawnebuild("install",actionmap,debug,1)	1796	continue_f=0
		1797	if ( mydo == "continue"): continue_f=1
		1798	retval=spawnebuild("install",actionmap,debug,1,continue_f)
1792	if retval: return retval	1799	if retval: return retval
1793	return merge(settings["CATEGORY"],settings["PF"],settings["D"],settings["BUILDDIR"]+"/build-info",myroot,myebuild=settings["EBUILD"])	1800	return merge(settings["CATEGORY"],settings["PF"],settings["D"],settings["BUILDDIR"]+"/build-info",myroot,myebuild=settings["EBUILD"])
1794	else:	1801	else: