Attachment #53196 for bug #84884




import gentoolkit
import portage
import portage_checksum
import portage_use_desc

import gentoolkit.pprinter as pp
from gentoolkit.pprinter import print_info, print_error, print_warn, die



        useflags = gentoolkit.settings["USE"].split()    
        usedesc = {}
        uselocaldesc = {}

        # Load USE flag descriptions
        use_desc=None
        try:
            use_desc=portage_use_desc.use_desc(gentoolkit.settings["PORTDIR"])
        except:
            print_warn("Could not load USE flag descriptions from " + gentoolkit.settings["PORTDIR"] + "/profiles/use.[local.]desc")
                if line[0] == "#":
                    continue
                fields = line.split(" - ")
                if len(fields) == 2:
                    usedesc[fields[0].strip()] = fields[1].strip()
        except IOError:
            print_warn(5, "Could not load USE flag descriptions from " + ppath(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))

        # Load local USE flag descriptions
        try:
            fd = open(gentoolkit.settings["PORTDIR"]+"/profiles/use.local.desc")
            for line in fd.readlines():
                if line[0] == "#":
                    continue
                fields = line.split(" - ")
                if len(fields) == 2:
                    catpkguse = re.search("([a-z]+-[a-z]+/.*):(.*)", fields[0])
                    if catpkguse:
                        if not uselocaldesc.has_key(catpkguse.group(1).strip()):
                            uselocaldesc[catpkguse.group(1).strip()] = {catpkguse.group(2).strip() : fields[1].strip()}
                        else:
                            uselocaldesc[catpkguse.group(1).strip()][catpkguse.group(2).strip()] = fields[1].strip()
        except IOError:
                print_warn(5, "Could not load USE flag descriptions from " + path(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))

        if not Config["piping"]: 
            print_info(3, "[ Colour Code : " + pp.useflagon("set") + " " + pp.useflagoff("unset") + " ]")

            # store (inuse, inused, flag, desc)
            output = []

            use_desc_dict={}
            if use_desc:
                use_desc_dict=use_desc.get_pkg_flags_desc(usevar,p.get_category()+"/"+p.get_name())

            for u in usevar:
                inuse = 0
                inused = 0
                try:
                    desc = use_desc_dict[u]
                except KeyError:
                    desc = ""
                        desc = uselocaldesc[p.get_category() + "/" + p.get_name()][u]
                    except KeyError:
                        desc = ""

                if u in p.get_settings("USE"):
                    inuse = 1

Return to bug 84884

Lines 27-32 Link Here

(-)equery.orig (-35 / +12 lines)
27	import gentoolkit	27	import gentoolkit
28	import portage	28	import portage
29	import portage_checksum	29	import portage_checksum
		30	import portage_use_desc
30		31
31	import gentoolkit.pprinter as pp	32	import gentoolkit.pprinter as pp
32	from gentoolkit.pprinter import print_info, print_error, print_warn, die	33	from gentoolkit.pprinter import print_info, print_error, print_warn, die
Lines 435-472 Link Here
435		436
436		437
437	useflags = gentoolkit.settings["USE"].split()	438	useflags = gentoolkit.settings["USE"].split()
438	usedesc = {}
439	uselocaldesc = {}
440		439
441	# Load global USE flag descriptions	440	# Load USE flag descriptions
		441	use_desc=None
442	try:	442	try:
443	fd = open(gentoolkit.settings["PORTDIR"]+"/profiles/use.desc")	443	use_desc=portage_use_desc.use_desc(gentoolkit.settings["PORTDIR"])
444	usedesc = {}	444	except:
445	for line in fd.readlines():	445	print_warn("Could not load USE flag descriptions from " + gentoolkit.settings["PORTDIR"] + "/profiles/use.[local.]desc")
446	if line[0] == "#":
447	continue
448	fields = line.split(" - ")
449	if len(fields) == 2:
450	usedesc[fields[0].strip()] = fields[1].strip()
451	except IOError:
452	print_warn(5, "Could not load USE flag descriptions from " + ppath(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))
453
454	# Load local USE flag descriptions
455	try:
456	fd = open(gentoolkit.settings["PORTDIR"]+"/profiles/use.local.desc")
457	for line in fd.readlines():
458	if line[0] == "#":
459	continue
460	fields = line.split(" - ")
461	if len(fields) == 2:
462	catpkguse = re.search("([a-z]+-[a-z]+/.):(.)", fields[0])
463	if catpkguse:
464	if not uselocaldesc.has_key(catpkguse.group(1).strip()):
465	uselocaldesc[catpkguse.group(1).strip()] = {catpkguse.group(2).strip() : fields[1].strip()}
466	else:
467	uselocaldesc[catpkguse.group(1).strip()][catpkguse.group(2).strip()] = fields[1].strip()
468	except IOError:
469	print_warn(5, "Could not load USE flag descriptions from " + path(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))
470		446
471	if not Config["piping"]:	447	if not Config["piping"]:
472	print_info(3, "[ Colour Code : " + pp.useflagon("set") + " " + pp.useflagoff("unset") + " ]")	448	print_info(3, "[ Colour Code : " + pp.useflagon("set") + " " + pp.useflagoff("unset") + " ]")
Lines 500-515 Link Here
500	# store (inuse, inused, flag, desc)	476	# store (inuse, inused, flag, desc)
501	output = []	477	output = []
502		478
		479	use_desc_dict={}
		480	if use_desc:
		481	use_desc_dict=use_desc.get_pkg_flags_desc(usevar,p.get_category()+"/"+p.get_name())
		482
503	for u in usevar:	483	for u in usevar:
504	inuse = 0	484	inuse = 0
505	inused = 0	485	inused = 0
506	try:	486	try:
507	desc = usedesc[u]	487	desc = use_desc_dict[u]
508	except KeyError:	488	except KeyError:
509	try:	489	desc = ""
510	desc = uselocaldesc[p.get_category() + "/" + p.get_name()][u]
511	except KeyError:
512	desc = ""
513		490
514	if u in p.get_settings("USE"):	491	if u in p.get_settings("USE"):
515	inuse = 1	492	inuse = 1