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

Collapse All | Expand All

(-)pym/portage.py (-2 / +19 lines)
Lines 3773-3778 Link Here
3773
		if mylist==None:
3841
		if mylist==None:
3774
			return []
3842
			return []
3775
		newlist=[]
3843
		newlist=[]
3844
		pkglist=grabfile("/etc/portage/package.keywords")
3845
		pkgdict = {}
3846
		for line in pkglist:
3847
			# default to ~arch if no specific keyword is given
3848
			if len(line.split()) == 1:
3849
				mykeywordlist = []
3850
				for keyword in groups:
3851
					if not keyword[0] in "~-":
3852
						mykeywordlist.append("~"+keyword)
3853
				pkgdict[line] = mykeywordlist
3854
			else:
3855
				pkgdict[line.split()[0]] = line.split()[1:]
3776
		for mycpv in mylist:
3856
		for mycpv in mylist:
3777
			#we need to update this next line when we have fully integrated the new db api
3857
			#we need to update this next line when we have fully integrated the new db api
3778
			auxerr=0
3858
			auxerr=0
Lines 3785-3799 Link Here
3785
				#print "!!! No KEYWORDS for "+str(mycpv)+" -- Untested Status"
3854
				#print "!!! No KEYWORDS for "+str(mycpv)+" -- Untested Status"
3786
				continue
3855
				continue
3787
			mygroups=myaux[0].split()
3856
			mygroups=myaux[0].split()
3857
			pgroups=groups[:]
3788
			match=0
3858
			match=0
3859
			for mykey in pkgdict:
3860
				if db["/"]["porttree"].dbapi.xmatch("bestmatch-list", mykey, None, None, [mycpv]) \
3861
						and catpkgsplit(dep_getcpv(mykey))[:2] == catpkgsplit(mycpv)[:2]:
3862
					pgroups.extend(pkgdict[mykey])
3789
			for gp in mygroups:
3863
			for gp in mygroups:
3790
				if gp=="*":
3864
				if gp=="*":
3791
					match=1
3865
					match=1
3792
					break
3866
					break
3793
				elif "-"+gp in groups:
3867
				elif "-"+gp in pgroups:
3794
					match=0
3868
					match=0
3795
					break
3869
					break
3796
				elif gp in groups:
3870
				elif gp in pgroups:
3797
					match=1
3871
					match=1
3798
					break
3872
					break
3799
			if match:
3873
			if match:

Return to bug 13616