aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/equery/equery')
-rwxr-xr-xsrc/equery/equery19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/equery/equery b/src/equery/equery
index d5b5945..fd8fa4f 100755
--- a/src/equery/equery
+++ b/src/equery/equery
@@ -17,6 +17,7 @@ import os
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")
@@ -529,6 +530,23 @@ class CmdDisplayUSEs(Command):
except IOError:
print_warn(5, "Could not load USE flag descriptions from " + ppath(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))
+ # TODO: Add USE_EXPANDED variables to usedesc hash -- Bug #238005
+ # Pseudo-code:
+ # 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:
fd = open(gentoolkit.settings["PORTDIR"]+"/profiles/use.local.desc")
@@ -1607,6 +1625,7 @@ class CmdFindUSEs(Command):
status = 2
useflags = pkg.get_env_var("IUSE").split()
+ useflags = [f.lstrip("+-") for f in useflags]
if query not in useflags:
continue