Attachment #6860 for bug #12768

Lines 1-6 Link Here

(-)./ChangeLog (+8 lines)
1	# ChangeLog for Portage; the Gentoo Linux ports system	1	# ChangeLog for Portage; the Gentoo Linux ports system
2	# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2	2	# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
3		3
		4	*portage-2.0.48 (27 Dec 2002): Features: --retry --firstfail
		5
		6	31 Dec 2002; Yannick Le Saint <y.lesaint@wanadoo.fr> emergehelp.py, portage.py, emerge
		7
		8	--firstfail: exit as soon as one merge failed
		9	--retry: retry merging packages if it might help
		10	--verbose: now show when starting a new merge
		11
4	*portage-2.0.46-r5 (30 Dec 2002): Touchups and sparc confs	12	*portage-2.0.46-r5 (30 Dec 2002): Touchups and sparc confs
5	fix for prelink unmerge problems. small touches to outputs.	13	fix for prelink unmerge problems. small touches to outputs.
6	sparc configs added. Azarah's fixups for the prep* scripts.	14	sparc configs added. Azarah's fixups for the prep* scripts.




merged=0
params=["selective", "deep", "self", "recurse", "empty"]
actions=["clean", "config", "help", "info", "prune", "rsync", "search", "sync", "system", "unmerge", "world", "inject", "regen", "depclean"]
options=["--autoclean", "--deep", "--selective", "--buildpkg", "--debug", "--nodeps", "--emptytree", "--fetchonly", "--changelog", "--firstfail",
"--noreplace", "--onlydeps", "--pretend", "--retry", "--usepkg", "--usepkgonly", "--searchdesc", "--verbose", "--update", "--help", "--oneshot", "--version"]

shortmapping={"a":"--autoclean", "b":"--buildpkg", "c":"clean", "C":"unmerge", "e":"--emptytree", "d":"--debug", "f":"--fetchonly",
	"h":"--help", "k":"--usepkg", "K":"--usepkgonly", "n":"--noreplace", "o":"--onlydeps", "p":"--pretend", "P":"prune", "s":"search",

		#IUSE-aware emerge
		#"no downgrade" emerge
		jbigkey=string.join(mybigkey)
		#this conditional is needed to prevent infinite recursion on already-processed deps
		if self.digraph.hasnode(jbigkey+" merge") or self.digraph.hasnode(jbigkey+" nomerge"):
			# just make sure myparent is registered
			if myparent==None: return 1
			for mymergetype in ["merge", "nomerge"]:
				existingkey=jbigkey+" "+mymergetype
				if not self.digraph.hasnode(existingkey): continue
				if myparent in self.digraph.parents(existingkey): return 1
				self.digraph.addnode(existingkey,myparent)
				return 1
			print "should not reach this point"
			return 1

		update_spinner()

	def outdated(self):
		return self.outdatedpackages
				
	def merge(self,mylist,mydigraph=None):
		returnme=0
		#check for blocking dependencies
		for x in mylist:

			if mylist[x][3]!="nomerge":
				mymergelist.append(mylist[x])

		mygraph=None      # dependencies not satisfied yet
		if mydigraph!=None: mygraph=mydigraph.copy()
		mybuiltlist=[]    # packages successfully built (in order)
		trycount=0        # number of `try to merge' done
		passcount=0       # pass number
		passmergecount=0  # number of packages merged in this pass
		# package key filter: should be merged packages only
		merge_only_filter=lambda p: string.split(p)[3] == "merge"
		# each pass, packages not successfully built yet are built
		# it takes care of dependencies though
		while 1:
			passmergecount=0
			for x in mymergelist:
				if mygraph!=None and not x[2] in map((lambda xkey: string.split(xkey)[2]), mygraph.allroots(merge_only_filter)): continue
				if "--verbose" in myopts:
					print "merge starting: "+x[2]
					sys.stdout.flush()
				trycount+=1
				myroot=x[1]
				#the last argument in the portage.doebuild() tells doebuild to *not* do dep checking
				#(emerge is already handling that)
				y=portage.portdb.findname(x[2])
				if not "--pretend" in myopts:
					print ">>> emerge ("+str(trycount)+" of "+str(len(mymergelist))+")",x[2],"to",x[1]
					emergelog(" >>> emerge ("+str(trycount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])
				if x[0]=="ebuild":
					if "--fetchonly" in myopts:
						retval=portage.doebuild(y,"fetch",myroot,edebug,("--pretend" in myopts))
						if retval:
							print
							print "!!! Fetch for",y,"failed, continuing..."
							print	
							returnme=1
					elif "--buildpkg" in myopts:
						#create pkg, then merge pkg
						retval=portage.doebuild(y,"clean",myroot,edebug)
						if retval:
							if "--firstfail" in myopts: sys.exit(1)
							else: continue
						retval=portage.doebuild(y,"package",myroot,edebug)
						if retval:
							if "--firstfail" in myopts: sys.exit(1)
							else: continue
						#dynamically update our database	
						portage.db[portage.root]["bintree"].inject(x[2])
						mytbz2=portage.db[portage.root]["bintree"].getname(x[2])
						retval=portage.pkgmerge(mytbz2,myroot)
						if retval==None:
							if "--firstfail" in myopts: sys.exit(1)
							else: continue
					else:
						retval=portage.doebuild(y,"clean",myroot,edebug)
						if retval:
							if "--firstfail" in myopts: sys.exit(1)
							else: continue
						retval=portage.doebuild(y,"merge",myroot,edebug)
						if retval:
							if "--firstfail" in myopts: sys.exit(1)
							else: continue
						#dynamically update our database	
				elif x[0]=="binary":
					#merge the tbz2
					mytbz2=portage.db[portage.root]["bintree"].getname(x[2])
					retval=portage.pkgmerge(mytbz2,x[1])
					if retval==None:
						sys.exit(1)
					#need to check for errors
				portage.db[x[1]]["vartree"].inject(x[2])
				myfavkey=portage.cpv_getkey(x[2])
				if (not "--fetchonly" in myopts) and (myfavkey in favorites):
					myfavs=portage.grabfile(myroot+"var/cache/edb/world")
					myfavdict=genericdict(myfavs)
					mysysdict=genericdict(syslist)
					#don't record if already in system profile or already recorded
					if (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):
						#we don't have a favorites entry for this package yet; add one
						myfavdict[myfavkey]=myfavkey
						print ">>> Recording",myfavkey,"in \"world\" favorites file..."
						portage.writedict(myfavdict,myroot+"var/cache/edb/world",writekey=0)
	
				if "--autoclean" in myopts:
					retval=portage.doebuild(y,"clean",myroot,edebug)
					if retval:
						sys.exit(1)
				
				if ("--pretend" not in myopts) and ("--fetchonly" not in myopts):
					# Clean the old package that we have merged over top of it.
					if portage.settings["AUTOCLEAN"] and (portage.settings["AUTOCLEAN"]=="yes"):
						xsplit=portage.pkgsplit(x[2])
						emergelog(" >>> AUTOCLEAN: "+xsplit[0])
						if not unmerge("clean", [xsplit[0]]):
							emergelog(" --- AUTOCLEAN: Nothing unmerged.")
					emergelog(" ::: completed emerge ("+str(trycount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])
	
					mysplit=portage.pkgsplit(x[2])
					if mysplit[0]=="sys-apps/portage":
						if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:
							if len(mymergelist) > trycount:
								myargv=sys.argv
								myr=0
								for myra in range(len(myargv)):
									print "Considering:",myargv[myr]
									if myargv[myr][0:len("portage")]=="portage":
										print "deleted:",myargv[myr]
										del myargv[myr]
										myr-=1
									if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage":
										print "deleted:",myargv[myr]
										del myargv[myr]
										myr-=1
									myr+=1
								emergelog(" *** RESTARTING emerge via exec() after change of portage version.")
								os.execv("/usr/lib/portage/bin/emerge", myargv)
				mybuiltlist.append(x)
				if mygraph!=None: mygraph.delnode(string.join(x))
				passmergecount+=1
			if len(mybuiltlist)==len(mymergelist): break
			if "--retry" in myopts and passmergecount!=0:
				passcount+=1
				continue
			print "Some packages have not been built:"
			for p in mymergelist:
				if p in mybuiltlist:
					print "  "+p[2]+" successfully built"
				else:
					print "  "+p[2]+" building failure"
			sys.exit(1)
							myr=0
							for myra in range(len(myargv)):
								print "Considering:",myargv[myr]
								if myargv[myr][0:len("portage")]=="portage":
									print "deleted:",myargv[myr]
									del myargv[myr]
									myr-=1
								if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage":
									print "deleted:",myargv[myr]
									del myargv[myr]
									myr-=1
								myr+=1
							emergelog(" *** RESTARTING emerge via exec() after change of portage version.")
							os.execv("/usr/lib/portage/bin/emerge", myargv)

		if ("--pretend" not in myopts) and (trycount>0):
			portage.env_update()



		print "Calculating dependencies  ",
		retval,favorites=mydepgraph.select_files(myfiles)
		if not retval:
			print "\n!!! Error calculating dependencies. Please correct."
			sys.exit(1)
		print "\b\b ...done!"
	if ("--pretend" in myopts) and not ("--fetchonly" in myopts):
		mydepgraph.display(mydepgraph.altlist())
	else:
		if "--retry" in myopts and not "--firstfail" in myopts:
			mydepgraph.merge(mydepgraph.altlist(), mydepgraph.digraph)
		else:
			mydepgraph.merge(mydepgraph.altlist())
		if portage.settings["AUTOCLEAN"] and "yes"==portage.settings["AUTOCLEAN"]:
			print ">>> Auto-cleaning packages ..."
			unmerge("clean", ["world"])

Lines 127-132 Link Here

(-)./bin/emergehelp.py (+8 lines)
127	print " used in combination with --pretend all the SRC_URIs will be"	127	print " used in combination with --pretend all the SRC_URIs will be"
128	print " displayed multiple mirrors per line, one line per file."	128	print " displayed multiple mirrors per line, one line per file."
129	print	129	print
		130	print " "+green("--firstfail")
		131	print " Stop merging as soon as any merge fails"
		132	print
130	print " "+green("--nodeps")	133	print " "+green("--nodeps")
131	print " Merge specified packages, but don't merge any dependencies."	134	print " Merge specified packages, but don't merge any dependencies."
132	print " Note that the build may fail if deps aren't satisfied."	135	print " Note that the build may fail if deps aren't satisfied."
Lines 158-163 Link Here
158	print " When pretending, also display the ChangeLog entries for packages"	161	print " When pretending, also display the ChangeLog entries for packages"
159	print " that will be upgraded."	162	print " that will be upgraded."
160	print	163	print
		164	print " "+green("--retry")
		165	print " ignored if firstfail option is on"
		166	print " retry to merge previously failed packages if i have managed to"
		167	print " merge some packages (may fix some broken dependencies)"
		168	print
161	print " "+green("--searchdesc")+" ("+green("-S")+" short option)"	169	print " "+green("--searchdesc")+" ("+green("-S")+" short option)"
162	print " Matches the search string against the description field as well"	170	print " Matches the search string against the description field as well"
163	print " the package's name. Take caution as the descriptions are also"	171	print " the package's name. Take caution as the descriptions are also"




				zerolist.append(x)
		return zerolist

	def parents(self,mykey):
		""" return parents of given node (None if given node does not exist"""
		if self.dict.has_key(mykey):
			return self.dict[mykey][1]
		else:
			return None

	def allroots(self,filterfunc=(lambda e: 1)):
		"""return all nodes having no dependency
		dependencies having filterfunc() giving false are ignored"""
		ret=dict(map((lambda p: [p, 1]), self.dict.keys()))
		for dependency in filter(filterfunc, self.dict.keys()):
			for depend_by in self.dict[dependency][1]:
				ret[depend_by]=0
		return filter((lambda k: ret[k]==1), ret.keys())

	def empty(self):
		if len(self.dict)==0:
			return 1

			mygraph.okeys=self.okeys[:]
		return mygraph

	def __str__(self):
		"""useful for debugging"""
		ret=""
		for mykey in self.dict.keys():
			ret = ret+ str(mykey)+"  =>  "+str(self.dict[mykey])+"\n"
		return ret

# valid end of version components; integers specify offset from release version
# pre=prerelease, p=patchlevel (should always be followed by an int), rc=release candidate
# all but _p (where it is required) can be followed by an optional trailing integer

Return to bug 12768

Lines 262-267 Link Here

(-)./pym/portage.py (+23 lines)
262	zerolist.append(x)	262	zerolist.append(x)
263	return zerolist	263	return zerolist
264		264
		265	def parents(self,mykey):
		266	""" return parents of given node (None if given node does not exist"""
		267	if self.dict.has_key(mykey):
		268	return self.dict[mykey][1]
		269	else:
		270	return None
		271
		272	def allroots(self,filterfunc=(lambda e: 1)):
		273	"""return all nodes having no dependency
		274	dependencies having filterfunc() giving false are ignored"""
		275	ret=dict(map((lambda p: [p, 1]), self.dict.keys()))
		276	for dependency in filter(filterfunc, self.dict.keys()):
		277	for depend_by in self.dict[dependency][1]:
		278	ret[depend_by]=0
		279	return filter((lambda k: ret[k]==1), ret.keys())
		280
265	def empty(self):	281	def empty(self):
266	if len(self.dict)==0:	282	if len(self.dict)==0:
267	return 1	283	return 1
Lines 277-282 Link Here
277	mygraph.okeys=self.okeys[:]	293	mygraph.okeys=self.okeys[:]
278	return mygraph	294	return mygraph
279		295
		296	def __str__(self):
		297	"""useful for debugging"""
		298	ret=""
		299	for mykey in self.dict.keys():
		300	ret = ret+ str(mykey)+" => "+str(self.dict[mykey])+"\n"
		301	return ret
		302
280	# valid end of version components; integers specify offset from release version	303	# valid end of version components; integers specify offset from release version
281	# pre=prerelease, p=patchlevel (should always be followed by an int), rc=release candidate	304	# pre=prerelease, p=patchlevel (should always be followed by an int), rc=release candidate
282	# all but _p (where it is required) can be followed by an optional trailing integer	305	# all but _p (where it is required) can be followed by an optional trailing integer

Lines 15-22 Link Here

(-)./bin/emerge (-94 / +140 lines)
15	merged=0	15	merged=0
16	params=["selective", "deep", "self", "recurse", "empty"]	16	params=["selective", "deep", "self", "recurse", "empty"]
17	actions=["clean", "config", "help", "info", "prune", "rsync", "search", "sync", "system", "unmerge", "world", "inject", "regen", "depclean"]	17	actions=["clean", "config", "help", "info", "prune", "rsync", "search", "sync", "system", "unmerge", "world", "inject", "regen", "depclean"]
18	options=["--autoclean", "--deep", "--selective", "--buildpkg", "--debug", "--nodeps", "--emptytree", "--fetchonly", "--changelog",	18	options=["--autoclean", "--deep", "--selective", "--buildpkg", "--debug", "--nodeps", "--emptytree", "--fetchonly", "--changelog", "--firstfail",
19	"--noreplace", "--onlydeps", "--pretend", "--usepkg", "--usepkgonly", "--searchdesc", "--verbose", "--update", "--help", "--oneshot", "--version"]	19	"--noreplace", "--onlydeps", "--pretend", "--retry", "--usepkg", "--usepkgonly", "--searchdesc", "--verbose", "--update", "--help", "--oneshot", "--version"]
20		20
21	shortmapping={"a":"--autoclean", "b":"--buildpkg", "c":"clean", "C":"unmerge", "e":"--emptytree", "d":"--debug", "f":"--fetchonly",	21	shortmapping={"a":"--autoclean", "b":"--buildpkg", "c":"clean", "C":"unmerge", "e":"--emptytree", "d":"--debug", "f":"--fetchonly",
22	"h":"--help", "k":"--usepkg", "K":"--usepkgonly", "n":"--noreplace", "o":"--onlydeps", "p":"--pretend", "P":"prune", "s":"search",	22	"h":"--help", "k":"--usepkg", "K":"--usepkgonly", "n":"--noreplace", "o":"--onlydeps", "p":"--pretend", "P":"prune", "s":"search",
Lines 427-434 Link Here
427	#IUSE-aware emerge	427	#IUSE-aware emerge
428	#"no downgrade" emerge	428	#"no downgrade" emerge
429	jbigkey=string.join(mybigkey)	429	jbigkey=string.join(mybigkey)
		430	#this conditional is needed to prevent infinite recursion on already-processed deps
430	if self.digraph.hasnode(jbigkey+" merge") or self.digraph.hasnode(jbigkey+" nomerge"):	431	if self.digraph.hasnode(jbigkey+" merge") or self.digraph.hasnode(jbigkey+" nomerge"):
431	#this conditional is needed to prevent infinite recursion on already-processed deps	432	# just make sure myparent is registered
		433	if myparent==None: return 1
		434	for mymergetype in ["merge", "nomerge"]:
		435	existingkey=jbigkey+" "+mymergetype
		436	if not self.digraph.hasnode(existingkey): continue
		437	if myparent in self.digraph.parents(existingkey): return 1
		438	self.digraph.addnode(existingkey,myparent)
		439	return 1
		440	print "should not reach this point"
432	return 1	441	return 1
433		442
434	update_spinner()	443	update_spinner()
Lines 854-860 Link Here
854	def outdated(self):	863	def outdated(self):
855	return self.outdatedpackages	864	return self.outdatedpackages
856		865
857	def merge(self,mylist):	866	def merge(self,mylist,mydigraph=None):
858	returnme=0	867	returnme=0
859	#check for blocking dependencies	868	#check for blocking dependencies
860	for x in mylist:	869	for x in mylist:
Lines 867-967 Link Here
867	if mylist[x][3]!="nomerge":	876	if mylist[x][3]!="nomerge":
868	mymergelist.append(mylist[x])	877	mymergelist.append(mylist[x])
869		878
870	mergecount=0	879	mygraph=None # dependencies not satisfied yet
871	for x in mymergelist:	880	if mydigraph!=None: mygraph=mydigraph.copy()
872	mergecount+=1	881	mybuiltlist=[] # packages successfully built (in order)
873	myroot=x[1]	882	trycount=0 # number of `try to merge' done
874	#the last argument in the portage.doebuild() tells doebuild to not do dep checking	883	passcount=0 # pass number
875	#(emerge is already handling that)	884	passmergecount=0 # number of packages merged in this pass
876	y=portage.portdb.findname(x[2])	885	# package key filter: should be merged packages only
877	if not "--pretend" in myopts:	886	merge_only_filter=lambda p: string.split(p)[3] == "merge"
878	print ">>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[2],"to",x[1]	887	# each pass, packages not successfully built yet are built
879	emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])	888	# it takes care of dependencies though
880	if x[0]=="ebuild":	889	while 1:
881	if "--fetchonly" in myopts:	890	passmergecount=0
882	retval=portage.doebuild(y,"fetch",myroot,edebug,("--pretend" in myopts))	891	for x in mymergelist:
883	if retval:	892	if mygraph!=None and not x[2] in map((lambda xkey: string.split(xkey)[2]), mygraph.allroots(merge_only_filter)): continue
884	print	893	if "--verbose" in myopts:
885	print "!!! Fetch for",y,"failed, continuing..."	894	print "merge starting: "+x[2]
886	print	895	sys.stdout.flush()
887	returnme=1	896	trycount+=1
888	elif "--buildpkg" in myopts:	897	myroot=x[1]
889	#create pkg, then merge pkg	898	#the last argument in the portage.doebuild() tells doebuild to not do dep checking
890	retval=portage.doebuild(y,"clean",myroot,edebug)	899	#(emerge is already handling that)
891	if retval:	900	y=portage.portdb.findname(x[2])
892	sys.exit(1)	901	if not "--pretend" in myopts:
893	retval=portage.doebuild(y,"package",myroot,edebug)	902	print ">>> emerge ("+str(trycount)+" of "+str(len(mymergelist))+")",x[2],"to",x[1]
894	if retval:	903	emergelog(" >>> emerge ("+str(trycount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])
895	sys.exit(1)	904	if x[0]=="ebuild":
896	#dynamically update our database	905	if "--fetchonly" in myopts:
897	portage.db[portage.root]["bintree"].inject(x[2])	906	retval=portage.doebuild(y,"fetch",myroot,edebug,("--pretend" in myopts))
		907	if retval:
		908	print
		909	print "!!! Fetch for",y,"failed, continuing..."
		910	print
		911	returnme=1
		912	elif "--buildpkg" in myopts:
		913	#create pkg, then merge pkg
		914	retval=portage.doebuild(y,"clean",myroot,edebug)
		915	if retval:
		916	if "--firstfail" in myopts: sys.exit(1)
		917	else: continue
		918	retval=portage.doebuild(y,"package",myroot,edebug)
		919	if retval:
		920	if "--firstfail" in myopts: sys.exit(1)
		921	else: continue
		922	#dynamically update our database
		923	portage.db[portage.root]["bintree"].inject(x[2])
		924	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])
		925	retval=portage.pkgmerge(mytbz2,myroot)
		926	if retval==None:
		927	if "--firstfail" in myopts: sys.exit(1)
		928	else: continue
		929	else:
		930	retval=portage.doebuild(y,"clean",myroot,edebug)
		931	if retval:
		932	if "--firstfail" in myopts: sys.exit(1)
		933	else: continue
		934	retval=portage.doebuild(y,"merge",myroot,edebug)
		935	if retval:
		936	if "--firstfail" in myopts: sys.exit(1)
		937	else: continue
		938	#dynamically update our database
		939	elif x[0]=="binary":
		940	#merge the tbz2
898	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])	941	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])
899	retval=portage.pkgmerge(mytbz2,myroot)	942	retval=portage.pkgmerge(mytbz2,x[1])
900	if retval==None:	943	if retval==None:
901	sys.exit(1)	944	sys.exit(1)
902	else:	945	#need to check for errors
		946	portage.db[x[1]]["vartree"].inject(x[2])
		947	myfavkey=portage.cpv_getkey(x[2])
		948	if (not "--fetchonly" in myopts) and (myfavkey in favorites):
		949	myfavs=portage.grabfile(myroot+"var/cache/edb/world")
		950	myfavdict=genericdict(myfavs)
		951	mysysdict=genericdict(syslist)
		952	#don't record if already in system profile or already recorded
		953	if (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):
		954	#we don't have a favorites entry for this package yet; add one
		955	myfavdict[myfavkey]=myfavkey
		956	print ">>> Recording",myfavkey,"in \"world\" favorites file..."
		957	portage.writedict(myfavdict,myroot+"var/cache/edb/world",writekey=0)
		958
		959	if "--autoclean" in myopts:
903	retval=portage.doebuild(y,"clean",myroot,edebug)	960	retval=portage.doebuild(y,"clean",myroot,edebug)
904	if retval:	961	if retval:
905	sys.exit(1)	962	sys.exit(1)
906	retval=portage.doebuild(y,"merge",myroot,edebug)	963
907	if retval:	964	if ("--pretend" not in myopts) and ("--fetchonly" not in myopts):
908	sys.exit(1)	965	# Clean the old package that we have merged over top of it.
909	#dynamically update our database	966	if portage.settings["AUTOCLEAN"] and (portage.settings["AUTOCLEAN"]=="yes"):
910	elif x[0]=="binary":	967	xsplit=portage.pkgsplit(x[2])
911	#merge the tbz2	968	emergelog(" >>> AUTOCLEAN: "+xsplit[0])
912	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])	969	if not unmerge("clean", [xsplit[0]]):
913	retval=portage.pkgmerge(mytbz2,x[1])	970	emergelog(" --- AUTOCLEAN: Nothing unmerged.")
914	if retval==None:	971	emergelog(" ::: completed emerge ("+str(trycount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])
915	sys.exit(1)	972
916	#need to check for errors	973	mysplit=portage.pkgsplit(x[2])
917	portage.db[x[1]]["vartree"].inject(x[2])	974	if mysplit[0]=="sys-apps/portage":
918	myfavkey=portage.cpv_getkey(x[2])	975	if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:
919	if (not "--fetchonly" in myopts) and (myfavkey in favorites):	976	if len(mymergelist) > trycount:
920	myfavs=portage.grabfile(myroot+"var/cache/edb/world")	977	myargv=sys.argv
921	myfavdict=genericdict(myfavs)	978	myr=0
922	mysysdict=genericdict(syslist)	979	for myra in range(len(myargv)):
923	#don't record if already in system profile or already recorded	980	print "Considering:",myargv[myr]
924	if (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):	981	if myargv[myr][0:len("portage")]=="portage":
925	#we don't have a favorites entry for this package yet; add one	982	print "deleted:",myargv[myr]
926	myfavdict[myfavkey]=myfavkey	983	del myargv[myr]
927	print ">>> Recording",myfavkey,"in \"world\" favorites file..."	984	myr-=1
928	portage.writedict(myfavdict,myroot+"var/cache/edb/world",writekey=0)	985	if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage":
929		986	print "deleted:",myargv[myr]
930	if "--autoclean" in myopts:	987	del myargv[myr]
931	retval=portage.doebuild(y,"clean",myroot,edebug)	988	myr-=1
932	if retval:	989	myr+=1
933	sys.exit(1)	990	emergelog(" *** RESTARTING emerge via exec() after change of portage version.")
934		991	os.execv("/usr/lib/portage/bin/emerge", myargv)
935	if ("--pretend" not in myopts) and ("--fetchonly" not in myopts):	992	mybuiltlist.append(x)
936	# Clean the old package that we have merged over top of it.	993	if mygraph!=None: mygraph.delnode(string.join(x))
937	if portage.settings["AUTOCLEAN"] and (portage.settings["AUTOCLEAN"]=="yes"):	994	passmergecount+=1
938	xsplit=portage.pkgsplit(x[2])	995	if len(mybuiltlist)==len(mymergelist): break
939	emergelog(" >>> AUTOCLEAN: "+xsplit[0])	996	if "--retry" in myopts and passmergecount!=0:
940	if not unmerge("clean", [xsplit[0]]):	997	passcount+=1
941	emergelog(" --- AUTOCLEAN: Nothing unmerged.")	998	continue
942	emergelog(" ::: completed emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])	999	print "Some packages have not been built:"
943		1000	for p in mymergelist:
944	mysplit=portage.pkgsplit(x[2])	1001	if p in mybuiltlist:
945	if mysplit[0]=="sys-apps/portage":	1002	print " "+p[2]+" successfully built"
946	if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:	1003	else:
947	if len(mymergelist) > mergecount:	1004	print " "+p[2]+" building failure"
948	myargv=sys.argv	1005	sys.exit(1)
949	myr=0
950	for myra in range(len(myargv)):
951	print "Considering:",myargv[myr]
952	if myargv[myr][0:len("portage")]=="portage":
953	print "deleted:",myargv[myr]
954	del myargv[myr]
955	myr-=1
956	if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage":
957	print "deleted:",myargv[myr]
958	del myargv[myr]
959	myr-=1
960	myr+=1
961	emergelog(" *** RESTARTING emerge via exec() after change of portage version.")
962	os.execv("/usr/lib/portage/bin/emerge", myargv)
963		1006
964	if ("--pretend" not in myopts) and (mergecount>0):	1007	if ("--pretend" not in myopts) and (trycount>0):
965	portage.env_update()	1008	portage.env_update()
966		1009
967		1010
Lines 1538-1550 Link Here
1538	print "Calculating dependencies ",	1581	print "Calculating dependencies ",
1539	retval,favorites=mydepgraph.select_files(myfiles)	1582	retval,favorites=mydepgraph.select_files(myfiles)
1540	if not retval:	1583	if not retval:
1541	print "\n!!! Error calculating dependancies. Please correct."	1584	print "\n!!! Error calculating dependencies. Please correct."
1542	sys.exit(1)	1585	sys.exit(1)
1543	print "\b\b ...done!"	1586	print "\b\b ...done!"
1544	if ("--pretend" in myopts) and not ("--fetchonly" in myopts):	1587	if ("--pretend" in myopts) and not ("--fetchonly" in myopts):
1545	mydepgraph.display(mydepgraph.altlist())	1588	mydepgraph.display(mydepgraph.altlist())
1546	else:	1589	else:
1547	mydepgraph.merge(mydepgraph.altlist())	1590	if "--retry" in myopts and not "--firstfail" in myopts:
		1591	mydepgraph.merge(mydepgraph.altlist(), mydepgraph.digraph)
		1592	else:
		1593	mydepgraph.merge(mydepgraph.altlist())
1548	if portage.settings["AUTOCLEAN"] and "yes"==portage.settings["AUTOCLEAN"]:	1594	if portage.settings["AUTOCLEAN"] and "yes"==portage.settings["AUTOCLEAN"]:
1549	print ">>> Auto-cleaning packages ..."	1595	print ">>> Auto-cleaning packages ..."
1550	unmerge("clean", ["world"])	1596	unmerge("clean", ["world"])