diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-11 19:30:22 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-11 11:10:28 -0700 |
| commit | 1e17e55e2cc40cf44be9e013720af512cc825dcd (patch) | |
| tree | 859ba9dcb3d7980d38d04da8cbdc841214afebfb /pym/_emerge/depgraph.py | |
| parent | f61743bfc8d48c12585fd5499646369270b0d391 (diff) | |
| download | portage-1e17e55e2cc40cf44be9e013720af512cc825dcd.tar.gz portage-1e17e55e2cc40cf44be9e013720af512cc825dcd.tar.bz2 portage-1e17e55e2cc40cf44be9e013720af512cc825dcd.zip | |
Make REQUIRED_USE work again. Without paren_reduce this time.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index c66072835..1be3a492e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2832,14 +2832,14 @@ class depgraph(object): iuse = self._frozen_config.settings._get_implicit_iuse() iuse.update(pkg.iuse.all) try: - sat, unsat = portage.dep.check_required_use( + required_use_is_sat = portage.dep.check_required_use( pkg.metadata["REQUIRED_USE"], use, iuse) - except portage.exception.InvalidRequiredUseString as e: + except portage.exception.InvalidDependString as e: portage.writemsg("!!! Invalid REQUIRED_USE specified by " + \ "'%s': %s\n" % (pkg.cpv, str(e)), noiselevel=-1) del e continue - if unsat: + if not required_use_is_sat: continue if pkg.cp == atom_cp: @@ -6190,15 +6190,13 @@ def _get_masking_status(pkg, pkgsettings, root_config): iuse = pkgsettings._get_implicit_iuse() iuse.update(pkg.iuse.all) try: - sat, unsat = portage.dep.check_required_use( + required_use_is_sat = portage.dep.check_required_use( required_use, use, iuse) - except portage.exception.InvalidRequiredUseString: + except portage.exception.InvalidDependString: mreasons.append("invalid: REQUIRED_USE") else: - if unsat: - msg = "violated use flag constraints: '%s'" % unsat - if sat: - msg += ", other constraints: '%s'" % sat + if not required_use_is_sat: + msg = "violated use flag constraints: '%s'" % required_use mreasons.append(msg) if not pkg.metadata["SLOT"]: |