[patch] patch to correct logic error

patch (text/plain), 1.62 KB, created by Rich on 2005-03-26 02:27:34 UTC

package.keywords was not working for me.  It seemed to have no effect.

In debugging, I observed what I believe to be a bug.  The original code
added the value '~amd64' to pgroups, which already contained 'amd64' and
'~amd64'.  Poor mygroups, however, had neither.  In the interests of
fair distribution of keywords, I changed the code to add the new keyword
to mygroups instead, which not only righted a horrible social injustice,
but also caused packages in the packages.keywords file to be accepted,
merged, and made welcome.

	Copyright and liability on this patch are both abandoned.

	So I said to the patch:
>> 		An you be mine, I'll give you to my friend;
>> 		An you be not, hang, beg, starve, die in the streets,
>> 		For, by my soul, I'll ne'er acknowledge thee,
>> 		Nor what is mine shall never do thee good.
>> 		Trust to't. Bethink you. I'll not be forsworn.

--- portage.py	2005-03-16 16:56:27.000000000 -0500
+++ /root/portage.py	2005-03-16 16:55:14.842028000 -0500
@@ -5571,21 +5571,21 @@
 				# KEYWORDS=""
 				#print "!!! No KEYWORDS for "+str(mycpv)+" -- Untested Status"
 				continue
 			mygroups=myaux[0].split()
 			pgroups=groups[:]
 			match=0
 			cp = dep_getkey(mycpv)
 			if pkgdict.has_key(cp):
 				matches = match_to_list(mycpv, pkgdict[cp].keys())
 				for atom in matches:
-					pgroups.extend(pkgdict[cp][atom])
+					mygroups.extend(pkgdict[cp][atom])
 			for gp in mygroups:
 				if gp=="*":
 					writemsg("--- WARNING: Package '%s' uses '*' keyword.\n" % mycpv)
 					match=1
 					break
 				elif "-"+gp in pgroups:
 					match=0
 					break
 				elif gp in pgroups:
 					match=1
-- 
Don't blame me, I voted libertarian.