Attachment #452528 for bug #594446

Lines 52-58 class Action(object): Link Here

(-)a/lib/flaggie/action.py (-1 / +1 lines)
52		52
53	# Check whether the argument looks like a pattern but denote that	53	# Check whether the argument looks like a pattern but denote that
54	# for keywords '*' and '' have special meaning.	54	# for keywords '*' and '' have special meaning.
55	if (ns and 'kw' not in ns) or arg not in ('*', ''):	55	if (ns and 'kw' not in ns) or arg not in ('*', '', '~*'):
56	for schr in ('*', '?', '['):	56	for schr in ('*', '?', '['):
57	if schr in arg:	57	if schr in arg:
58	if not ns:	58	if not ns:

Lines 95-101 class Caches(object): Link Here

(-)a/lib/flaggie/cache.py (-1 / +1 lines)
95	kws = set()	95	kws = set()
96	for r in self.dbapi.porttrees:	96	for r in self.dbapi.porttrees:
97	kws.update(grabfile(os.path.join(r, 'profiles', 'arch.list')))	97	kws.update(grabfile(os.path.join(r, 'profiles', 'arch.list')))
98	kws.update(['~%s' % x for x in kws], ('', '*'))	98	kws.update(['~%s' % x for x in kws], ('', '', '~'))
99		99
100	# and the ** special keyword	100	# and the ** special keyword
101	self.cache[None] = frozenset(kws)	101	self.cache[None] = frozenset(kws)

Lines 61-67 class DropUnmatchedFlags(BaseCleanupAction): Link Here

(-)a/lib/flaggie/cleanup.py (-1 / +1 lines)
61	if dbcache[pe.package]:	61	if dbcache[pe.package]:
62	flags = cache[pe.package]	62	flags = cache[pe.package]
63	for flag in set([x.name for x in pe]):	63	for flag in set([x.name for x in pe]):
64	if k == 'kw' and flag == '**':	64	if k == 'kw' and (flag == '*' or flag == '' or flag == '~*'):
65	pass	65	pass
66	elif flag not in flags:	66	elif flag not in flags:
67	del pe[flag]	67	del pe[flag]

Return to bug 594446