Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 9379
Collapse All | Expand All

(-)portage.py (-1 / +10 lines)
Lines 897-903 Link Here
897
			sys.exit(1)
897
			sys.exit(1)
898
		self.configlist.append(self.mygcfg)
898
		self.configlist.append(self.mygcfg)
899
		self.configdict["conf"]=self.configlist[-1]
899
		self.configdict["conf"]=self.configlist[-1]
900
900
		self.configdict["conf"]["PKG_KEYWORDS"]=grabfile("/etc/portage/package.keyword")
901
		
901
		for x in incrementals:
902
		for x in incrementals:
902
			if os.environ.has_key(x):
903
			if os.environ.has_key(x):
903
				self.backupenv[x]=os.environ[x]
904
				self.backupenv[x]=os.environ[x]
Lines 993-998 Link Here
993
						usesplit.insert(0,self.configdict["defaults"]["ARCH"])
1027
						usesplit.insert(0,self.configdict["defaults"]["ARCH"])
994
						self.configlist[-1]["USE"]=string.join(usesplit," ")
1028
						self.configlist[-1]["USE"]=string.join(usesplit," ")
995
	
1029
	
1030
		self.configlist[-1]["PKG_KEYWORDS"]=""
1031
		for x in self.configdict["conf"]["PKG_KEYWORDS"]:
1032
			self.configlist[-1]["PKG_KEYWORDS"]=x+" "+self.configlist[-1]["PKG_KEYWORDS"]
1033
		
996
	def __getitem__(self,mykey):
1034
	def __getitem__(self,mykey):
997
		if mykey=="CONFIG_PROTECT_MASK":
1035
		if mykey=="CONFIG_PROTECT_MASK":
998
			suffix=" /etc/env.d"
1036
			suffix=" /etc/env.d"
Lines 3790-3796 Link Here
3790
				continue
3862
				continue
3791
			mygroups=myaux[0].split()
3863
			mygroups=myaux[0].split()
3792
			match=0
3864
			match=0
3865
			mypkg=catpkgsplit(mycpv)[0]+"/"+catpkgsplit(mycpv)[1]
3793
			for gp in mygroups:
3866
			for gp in mygroups:
3867
				if mypkg in settings["PKG_KEYWORDS"].split() and gp[0] == "~" and gp[1:] in groups:
3868
					match=1
3869
					break
3794
				if gp=="*":
3870
				if gp=="*":
3795
					match=1
3871
					match=1
3796
					break
3872
					break

Return to bug 9379