diff options
| -rw-r--r-- | src/autodep/package_utils/portage_misc_functions.py | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/autodep/package_utils/portage_misc_functions.py b/src/autodep/package_utils/portage_misc_functions.py index 2b6d4e1..fd00be9 100644 --- a/src/autodep/package_utils/portage_misc_functions.py +++ b/src/autodep/package_utils/portage_misc_functions.py @@ -76,22 +76,17 @@ class portage_api: yield atom continue - valid_iuse = [] - for x in iuse.split(): - if x[:1] in ("+", "-"): - x = x[1:] - valid_iuse.append(x) - valid_iuse = frozenset(valid_iuse) - - iuse_implicit_match = vardb.settings._iuse_implicit_match - valid_use = [] - for x in use.split(): - if x in valid_iuse or iuse_implicit_match(x): - valid_use.append(x) - valid_use = frozenset(valid_use) + iuse_defaults=[ + u[1:] for u in iuse.split() if u.startswith("+")] + + use=use.split() + + for u in iuse_defaults: + if u not in use: + use.append(u) success, atoms = portage.dep_check(rdepend, - None, vardb.settings, myuse=valid_use, + None, vardb.settings, myuse=use, myroot=vardb.root, trees={vardb.root:{"porttree":vardb.vartree, "vartree":vardb.vartree}}) |