Attachment #6859 for bug #12768

Lines 1-6 Link Here

(-)./ChangeLog (+7 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): Feature: --retry
		5
		6	27 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
4	*portage-2.0.46-r3 (24 Dec 2002): Backport of fixes in 2.0.47_pre2	11	*portage-2.0.46-r3 (24 Dec 2002): Backport of fixes in 2.0.47_pre2
5		12
6	*portage-2.0.47_pre2 (24 Dec 2002): Feature: userpriv compiles	13	*portage-2.0.47_pre2 (24 Dec 2002): Feature: userpriv compiles




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 848-854 Link Here
848	def outdated(self):	857	def outdated(self):
849	return self.outdatedpackages	858	return self.outdatedpackages
850		859
851	def merge(self,mylist):	860	def merge(self,mylist,mydigraph=None):
852	returnme=0	861	returnme=0
853	#check for blocking dependencies	862	#check for blocking dependencies
854	for x in mylist:	863	for x in mylist:
Lines 861-961 Link Here
861	if mylist[x][3]!="nomerge":	870	if mylist[x][3]!="nomerge":
862	mymergelist.append(mylist[x])	871	mymergelist.append(mylist[x])
863		872
864	mergecount=0	873	mygraph=None # dependencies not satisfied yet
865	for x in mymergelist:	874	if mydigraph!=None: mygraph=mydigraph.copy()
866	mergecount+=1	875	mybuiltlist=[] # packages successfully built (in order)
867	myroot=x[1]	876	trycount=0 # number of `try to merge' done
868	#the last argument in the portage.doebuild() tells doebuild to not do dep checking	877	passcount=0 # pass number
869	#(emerge is already handling that)	878	passmergecount=0 # number of packages merged in this pass
870	y=portage.portdb.findname(x[2])	879	# package key filter: should be merged packages only
871	if not "--pretend" in myopts:	880	merge_only_filter=lambda p: string.split(p)[3] == "merge"
872	print ">>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[2],"to",x[1]	881	# each pass, packages not successfully built yet are built
873	emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])	882	# it takes care of dependencies though
874	if x[0]=="ebuild":	883	while 1:
875	if "--fetchonly" in myopts:	884	passmergecount=0
876	retval=portage.doebuild(y,"fetch",myroot,edebug,("--pretend" in myopts))	885	for x in mymergelist:
877	if retval:	886	if mygraph!=None and not x[2] in map((lambda xkey: string.split(xkey)[2]), mygraph.allroots(merge_only_filter)): continue
878	print	887	if "--verbose" in myopts:
879	print "!!! Fetch for",y,"failed, continuing..."	888	print "merge starting: "+x[2]
880	print	889	sys.stdout.flush()
881	returnme=1	890	trycount+=1
882	elif "--buildpkg" in myopts:	891	myroot=x[1]
883	#create pkg, then merge pkg	892	#the last argument in the portage.doebuild() tells doebuild to not do dep checking
884	retval=portage.doebuild(y,"clean",myroot,edebug)	893	#(emerge is already handling that)
885	if retval:	894	y=portage.portdb.findname(x[2])
886	sys.exit(1)	895	if not "--pretend" in myopts:
887	retval=portage.doebuild(y,"package",myroot,edebug)	896	print ">>> emerge ("+str(trycount)+" of "+str(len(mymergelist))+")",x[2],"to",x[1]
888	if retval:	897	emergelog(" >>> emerge ("+str(trycount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])
889	sys.exit(1)	898	if x[0]=="ebuild":
890	#dynamically update our database	899	if "--fetchonly" in myopts:
891	portage.db[portage.root]["bintree"].inject(x[2])	900	retval=portage.doebuild(y,"fetch",myroot,edebug,("--pretend" in myopts))
		901	if retval:
		902	print
		903	print "!!! Fetch for",y,"failed, continuing..."
		904	print
		905	returnme=1
		906	elif "--buildpkg" in myopts:
		907	#create pkg, then merge pkg
		908	retval=portage.doebuild(y,"clean",myroot,edebug)
		909	if retval:
		910	if "--firstfail" in myopts: sys.exit(1)
		911	else: continue
		912	retval=portage.doebuild(y,"package",myroot,edebug)
		913	if retval:
		914	if "--firstfail" in myopts: sys.exit(1)
		915	else: continue
		916	#dynamically update our database
		917	portage.db[portage.root]["bintree"].inject(x[2])
		918	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])
		919	retval=portage.pkgmerge(mytbz2,myroot)
		920	if retval==None:
		921	if "--firstfail" in myopts: sys.exit(1)
		922	else: continue
		923	else:
		924	retval=portage.doebuild(y,"clean",myroot,edebug)
		925	if retval:
		926	if "--firstfail" in myopts: sys.exit(1)
		927	else: continue
		928	retval=portage.doebuild(y,"merge",myroot,edebug)
		929	if retval:
		930	if "--firstfail" in myopts: sys.exit(1)
		931	else: continue
		932	#dynamically update our database
		933	elif x[0]=="binary":
		934	#merge the tbz2
892	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])	935	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])
893	retval=portage.pkgmerge(mytbz2,myroot)	936	retval=portage.pkgmerge(mytbz2,x[1])
894	if retval==None:	937	if retval==None:
895	sys.exit(1)	938	sys.exit(1)
896	else:	939	#need to check for errors
		940	portage.db[x[1]]["vartree"].inject(x[2])
		941	myfavkey=portage.cpv_getkey(x[2])
		942	if (not "--fetchonly" in myopts) and (myfavkey in favorites):
		943	myfavs=portage.grabfile(myroot+"var/cache/edb/world")
		944	myfavdict=genericdict(myfavs)
		945	mysysdict=genericdict(syslist)
		946	#don't record if already in system profile or already recorded
		947	if (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):
		948	#we don't have a favorites entry for this package yet; add one
		949	myfavdict[myfavkey]=myfavkey
		950	print ">>> Recording",myfavkey,"in \"world\" favorites file..."
		951	portage.writedict(myfavdict,myroot+"var/cache/edb/world",writekey=0)
		952
		953	if "--autoclean" in myopts:
897	retval=portage.doebuild(y,"clean",myroot,edebug)	954	retval=portage.doebuild(y,"clean",myroot,edebug)
898	if retval:	955	if retval:
899	sys.exit(1)	956	sys.exit(1)
900	retval=portage.doebuild(y,"merge",myroot,edebug)	957
901	if retval:	958	if ("--pretend" not in myopts) and ("--fetchonly" not in myopts):
902	sys.exit(1)	959	# Clean the old package that we have merged over top of it.
903	#dynamically update our database	960	if portage.settings["AUTOCLEAN"] and (portage.settings["AUTOCLEAN"]=="yes"):
904	elif x[0]=="binary":	961	xsplit=portage.pkgsplit(x[2])
905	#merge the tbz2	962	emergelog(" >>> AUTOCLEAN: "+xsplit[0])
906	mytbz2=portage.db[portage.root]["bintree"].getname(x[2])	963	if not unmerge("clean", [xsplit[0]]):
907	retval=portage.pkgmerge(mytbz2,x[1])	964	emergelog(" --- AUTOCLEAN: Nothing unmerged.")
908	if retval==None:	965	emergelog(" ::: completed emerge ("+str(trycount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])
909	sys.exit(1)	966
910	#need to check for errors	967	mysplit=portage.pkgsplit(x[2])
911	portage.db[x[1]]["vartree"].inject(x[2])	968	if mysplit[0]=="sys-apps/portage":
912	myfavkey=portage.cpv_getkey(x[2])	969	if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:
913	if (not "--fetchonly" in myopts) and (myfavkey in favorites):	970	if len(mymergelist) > trycount:
914	myfavs=portage.grabfile(myroot+"var/cache/edb/world")	971	myargv=sys.argv
915	myfavdict=genericdict(myfavs)	972	myr=0
916	mysysdict=genericdict(syslist)	973	for myra in range(len(myargv)):
917	#don't record if already in system profile or already recorded	974	print "Considering:",myargv[myr]
918	if (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):	975	if myargv[myr][0:len("portage")]=="portage":
919	#we don't have a favorites entry for this package yet; add one	976	print "deleted:",myargv[myr]
920	myfavdict[myfavkey]=myfavkey	977	del myargv[myr]
921	print ">>> Recording",myfavkey,"in \"world\" favorites file..."	978	myr-=1
922	portage.writedict(myfavdict,myroot+"var/cache/edb/world",writekey=0)	979	if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage":
923		980	print "deleted:",myargv[myr]
924	if "--autoclean" in myopts:	981	del myargv[myr]
925	retval=portage.doebuild(y,"clean",myroot,edebug)	982	myr-=1
926	if retval:	983	myr+=1
927	sys.exit(1)	984	emergelog(" *** RESTARTING emerge via exec() after change of portage version.")
928		985	os.execv("/usr/lib/portage/bin/emerge", myargv)
929	if ("--pretend" not in myopts) and ("--fetchonly" not in myopts):	986	mybuiltlist.append(x)
930	# Clean the old package that we have merged over top of it.	987	if mygraph!=None: mygraph.delnode(string.join(x))
931	if portage.settings["AUTOCLEAN"] and (portage.settings["AUTOCLEAN"]=="yes"):	988	passmergecount+=1
932	xsplit=portage.pkgsplit(x[2])	989	if len(mybuiltlist)==len(mymergelist): break
933	emergelog(" >>> AUTOCLEAN: "+xsplit[0])	990	if "--retry" in myopts and passmergecount!=0:
934	if not unmerge("clean", [xsplit[0]]):	991	passcount+=1
935	emergelog(" --- AUTOCLEAN: Nothing unmerged.")	992	continue
936	emergelog(" ::: completed emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])	993	print "Some packages have not been built:"
937		994	for p in mymergelist:
938	mysplit=portage.pkgsplit(x[2])	995	if p in mybuiltlist:
939	if mysplit[0]=="sys-apps/portage":	996	print " "+p[2]+" successfully built"
940	if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:	997	else:
941	if len(mymergelist) > mergecount:	998	print " "+p[2]+" building failure"
942	myargv=sys.argv	999	sys.exit(1)
943	myr=0
944	for myra in range(len(myargv)):
945	print "Considering:",myargv[myr]
946	if myargv[myr][0:len("portage")]=="portage":
947	print "deleted:",myargv[myr]
948	del myargv[myr]
949	myr-=1
950	if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage":
951	print "deleted:",myargv[myr]
952	del myargv[myr]
953	myr-=1
954	myr+=1
955	emergelog(" *** RESTARTING emerge via exec() after change of portage version.")
956	os.execv("/usr/lib/portage/bin/emerge", myargv)
957		1000
958	if ("--pretend" not in myopts) and (mergecount>0):	1001	if ("--pretend" not in myopts) and (trycount>0):
959	portage.env_update()	1002	portage.env_update()
960		1003
961		1004
Lines 1532-1544 Link Here
1532	print "Calculating dependencies ",	1575	print "Calculating dependencies ",
1533	retval,favorites=mydepgraph.select_files(myfiles)	1576	retval,favorites=mydepgraph.select_files(myfiles)
1534	if not retval:	1577	if not retval:
1535	print "\n!!! Error calculating dependancies. Please correct."	1578	print "\n!!! Error calculating dependencies. Please correct."
1536	sys.exit(1)	1579	sys.exit(1)
1537	print "\b\b ...done!"	1580	print "\b\b ...done!"
1538	if ("--pretend" in myopts) and not ("--fetchonly" in myopts):	1581	if ("--pretend" in myopts) and not ("--fetchonly" in myopts):
1539	mydepgraph.display(mydepgraph.altlist())	1582	mydepgraph.display(mydepgraph.altlist())
1540	else:	1583	else:
1541	mydepgraph.merge(mydepgraph.altlist())	1584	if "--retry" in myopts and not "--firstfail" in myopts:
		1585	mydepgraph.merge(mydepgraph.altlist(), mydepgraph.digraph)
		1586	else:
		1587	mydepgraph.merge(mydepgraph.altlist())
1542	if portage.settings["AUTOCLEAN"] and "yes"==portage.settings["AUTOCLEAN"]:	1588	if portage.settings["AUTOCLEAN"] and "yes"==portage.settings["AUTOCLEAN"]:
1543	print ">>> Auto-cleaning packages ..."	1589	print ">>> Auto-cleaning packages ..."
1544	unmerge("clean", ["world"])	1590	unmerge("clean", ["world"])