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

Collapse All | Expand All

(-)equery.orig (-35 / +13 lines)
Lines 28-33 Link Here
28
import portage
28
import portage
29
import portage_checksum
29
import portage_checksum
30
from portage_util import unique_array
30
from portage_util import unique_array
31
import portage_use_desc
31
32
32
import gentoolkit.pprinter as pp
33
import gentoolkit.pprinter as pp
33
from gentoolkit.pprinter import print_info, print_error, print_warn, die
34
from gentoolkit.pprinter import print_info, print_error, print_warn, die
Lines 455-492 Link Here
455
456
456
457
457
		useflags = gentoolkit.settings["USE"].split()	
458
		useflags = gentoolkit.settings["USE"].split()	
458
		usedesc = {}
459
		uselocaldesc = {}
460
459
461
		# Load global USE flag descriptions
460
		# Load USE flag descriptions
461
		use_desc=None
462
		try:
462
		try:
463
			fd = open(gentoolkit.settings["PORTDIR"]+"/profiles/use.desc")
463
			use_desc=portage_use_desc.use_desc(gentoolkit.settings["PORTDIR"])
464
			usedesc = {}
464
		except:
465
			for line in fd.readlines():
465
			print_warn("Could not load USE flag descriptions from" \
466
				if line[0] == "#":
466
				+ " %s/profiles/use.[local.]desc" % gentoolkit.settings["PORTDIR"])
467
					continue
468
				fields = line.split(" - ")
469
				if len(fields) == 2:
470
					usedesc[fields[0].strip()] = fields[1].strip()
471
		except IOError:
472
			print_warn(5, "Could not load USE flag descriptions from " + ppath(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))
473
474
		# Load local USE flag descriptions
475
		try:
476
			fd = open(gentoolkit.settings["PORTDIR"]+"/profiles/use.local.desc")
477
			for line in fd.readlines():
478
				if line[0] == "#":
479
					continue
480
				fields = line.split(" - ")
481
				if len(fields) == 2:
482
					catpkguse = re.search("(.*):(.*)", fields[0])
483
					if catpkguse:
484
						if not uselocaldesc.has_key(catpkguse.group(1).strip()):
485
							uselocaldesc[catpkguse.group(1).strip()] = {catpkguse.group(2).strip() : fields[1].strip()}
486
						else:
487
							uselocaldesc[catpkguse.group(1).strip()][catpkguse.group(2).strip()] = fields[1].strip()
488
		except IOError:
489
				print_warn(5, "Could not load USE flag descriptions from " + path(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))
490
467
491
		if not Config["piping"] and Config["verbosityLevel"] >= 3: 
468
		if not Config["piping"] and Config["verbosityLevel"] >= 3: 
492
			print_info(3, "[ Colour Code : " + pp.useflagon("set") + " " + pp.useflagoff("unset") + " ]")
469
			print_info(3, "[ Colour Code : " + pp.useflagon("set") + " " + pp.useflagoff("unset") + " ]")
Lines 523-538 Link Here
523
			# store (inuse, inused, flag, desc)
500
			# store (inuse, inused, flag, desc)
524
			output = []
501
			output = []
525
502
503
			use_desc_dict={}
504
			if use_desc:
505
				use_desc_dict=use_desc.get_pkg_flags_desc(usevar,p.get_category()+"/"+p.get_name())
506
526
			for u in usevar:
507
			for u in usevar:
527
				inuse = 0
508
				inuse = 0
528
				inused = 0
509
				inused = 0
529
				try:
510
				try:
530
					desc = usedesc[u]
511
					desc = use_desc_dict[u]
531
				except KeyError:
512
				except KeyError:
532
					try:
513
					desc = ""
533
						desc = uselocaldesc[p.get_category() + "/" + p.get_name()][u]
534
					except KeyError:
535
						desc = ""
536
514
537
				if u in p.get_settings("USE").split():
515
				if u in p.get_settings("USE").split():
538
					inuse = 1
516
					inuse = 1

Return to bug 84884