[gentoo-commits] gentoolkit r524 - trunk/src/equery

[gentoo-commits] gentoolkit r524 - trunk/src/equery

[Petteri Raty (betelgeuse)]

Author: betelgeuse
Date: 2008-11-27 13:52:01 +0000 (Thu, 27 Nov 2008)
New Revision: 524

Modified:
   trunk/src/equery/equery
Log:
Add support for showing USE_EXPAND variables. Patch from Michael A. Smith <michael@smith-li.com>. Fixes bug #238005.

Modified: trunk/src/equery/equery
===================================================================
--- trunk/src/equery/equery	2008-11-26 19:42:41 UTC (rev 523)
+++ trunk/src/equery/equery	2008-11-27 13:52:01 UTC (rev 524)
@@ -17,6 +17,7 @@
 import re
 import sys
 import time
+from glob import glob
 
 # portage (output module) and gentoolkit need special path modifications
 sys.path.insert(0, "/usr/lib/gentoolkit/pym")
@@ -534,6 +535,17 @@
 		# for all files in gentoolkit.settings["PORTDIR"]+"/desc/*.desc
 		# variable name = <filename>_<field1>
 		# description = <field 2>
+		for descfile in glob(gentoolkit.settings["PORTDIR"]+"/profiles/desc/*.desc"):
+			try:
+				fd = open(descfile)
+				for line in fd.readlines():
+					if line[0] == "#":
+						continue
+					fields = [field.strip() for field in line.split(" - ", 1)]
+					if len(fields) == 2:
+							usedesc["%s_%s" % (descfile.split("/")[-1][0:-5], fields[0],)] = fields[1]
+			except IOError:
+				print_warn(5, "Could not load USE flag descriptions from " + descfile)
 
 		# Load local USE flag descriptions
 		try: