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

Collapse All | Expand All

(-)bin/emerge (-4 / +11 lines)
Lines 3193-3199 Link Here
3193
	vartree = trees[settings["ROOT"]]["vartree"]
3193
	vartree = trees[settings["ROOT"]]["vartree"]
3194
	syslist = getlist(settings, "system")
3194
	syslist = getlist(settings, "system")
3195
	worldlist = getlist(settings, "world")
3195
	worldlist = getlist(settings, "world")
3196
	myvarlist = vartree.dbapi.cp_all()
3196
	myvarlist = vartree.dbapi.cpv_all()
3197
3197
3198
	if not syslist:
3198
	if not syslist:
3199
		print "\n!!! You have no system list.",
3199
		print "\n!!! You have no system list.",
Lines 3235-3240 Link Here
3235
		sys.exit(1)
3235
		sys.exit(1)
3236
3236
3237
	reallist=[]
3237
	reallist=[]
3238
	explicitly_required = set()
3238
	for x in alldeps:
3239
	for x in alldeps:
3239
		myparts=portage.catpkgsplit(string.split(x)[2])
3240
		myparts=portage.catpkgsplit(string.split(x)[2])
3240
		if not myparts:
3241
		if not myparts:
Lines 3251-3262 Link Here
3251
		catpack=myparts[0]+"/"+myparts[1]
3252
		catpack=myparts[0]+"/"+myparts[1]
3252
		if catpack not in reallist:
3253
		if catpack not in reallist:
3253
			reallist.append(catpack)
3254
			reallist.append(catpack)
3255
		explicitly_required.add(x.split()[2])
3254
3256
3255
	cleanlist=[]
3257
	cleanlist=[]
3258
	clean_unversioned = []
3256
	for x in myvarlist:
3259
	for x in myvarlist:
3257
		if x not in reallist:
3260
		if x not in explicitly_required:
3258
			if x not in cleanlist:
3261
			if x not in cleanlist:
3259
				cleanlist.append(x)
3262
				cleanlist.append(x)
3263
				myparts = portage.catpkgsplit(x.split()[2])
3264
				clean_unversioned.append(myparts[0] + "/" + myparts[1])
3260
3265
3261
	for x in syslist+worldlist:
3266
	for x in syslist+worldlist:
3262
		myparts = portage.catpkgsplit(x)
3267
		myparts = portage.catpkgsplit(x)
Lines 3268-3275 Link Here
3268
			catpack=myparts[0]+"/"+myparts[1]
3273
			catpack=myparts[0]+"/"+myparts[1]
3269
		else:
3274
		else:
3270
			catpack=x
3275
			catpack=x
3271
		if catpack in cleanlist:
3276
		while catpack in clean_unversioned:
3272
			cleanlist.remove(catpack)
3277
			idx = clean_unversioned.index(catpack)
3278
			del cleanlist[idx]
3279
			del clean_unversioned[idx]
3273
3280
3274
	#print "\n\n\nCleaning: "
3281
	#print "\n\n\nCleaning: "
3275
	#for x in cleanlist:
3282
	#for x in cleanlist:

Return to bug 140591