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 | |
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.
-rwxr-xr-x | bin/repoman | 2 | ||||
-rw-r--r-- | pym/_emerge/depgraph.py | 16 | ||||
-rw-r--r-- | pym/portage/dep/__init__.py | 201 | ||||
-rw-r--r-- | pym/portage/exception.py | 3 | ||||
-rw-r--r-- | pym/portage/tests/dep/testCheckRequiredUse.py | 93 |
5 files changed, 189 insertions, 126 deletions
diff --git a/bin/repoman b/bin/repoman index 09e7f02f1..71fb58ac3 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1784,7 +1784,7 @@ for x in scanlist: iuse = repoman_settings._get_implicit_iuse() iuse.update(myaux["IUSE"].split()) portage.dep.check_required_use(required_use, "", iuse) - except portage.exception.InvalidRequiredUseString as e: + except portage.exception.InvalidDependString as e: stats["REQUIRED_USE.syntax"] = stats["REQUIRED_USE.syntax"] + 1 fails["REQUIRED_USE.syntax"].append( "%s: REQUIRED_USE: %s" % (relative_path, e)) 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"]: diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index d01b57527..1b89afec0 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1356,130 +1356,105 @@ def match_from_list(mydep, candidate_list): return mylist -def _check_required_use(constraints, use, iuse): +def check_required_use(required_use, use, iuse): """ Checks if the use flags listed in 'use' satisfy all - constraints specified in 'constraints'. Returns a tuple - containing the satisfied and unsatisfied and constraints - that were ignored because of the use flag configuration. + constraints specified in 'constraints'. - @param constraints: List of constraints as definied by REQUIRED_USE processed by paren_normalize - @type constraints: List + @param constraints: REQUIRED_USE string + @type constraints: String @param use: Enabled use flags @param use: List @param iuse: Referenceable use flags @param iuse: List - @rtype: Tuple of three lists - @return: 1. all satisifed constraints, all unsatisfied constraints, - all constraints not in effect due to use flag configuration + @rtype: Bool + @return: Indicates if REQUIRED_USE constraints are satisfied """ - sat = [] - unsat = [] - ignore = [] - skip_next = False - for id, constraint in enumerate(constraints): - #constraint is one of: - #a) an operator (||, ^^) - #b) a use flag (use, !use) - #c) a use conditional (use?, !use?) - - if skip_next: - #We skip all lists of constraints here, because they are handled together - #with theier operator / use conditional - skip_next = False - continue - if not isinstance(constraint, basestring): - raise portage.exception.InvalidRequiredUseString( - ("check_required_use(): '%s' constraint list without " + \ - "use conditional or operator") % (constraints,)) - - if not constraint: - raise portage.exception.InvalidRequiredUseString( - ("check_required_use(): '%s' syntax error") % (constraints,) ) - - if constraint[-1] == "?": - #a use conditional - skip_next = True - if constraint[0] == "!": - not_use_cons = True - flag = constraint[1:-1] - else: - not_use_cons = False - flag = constraint[:-1] - - if not flag in iuse: - raise portage.exception.InvalidRequiredUseString( - ("check_required_use(): '%s' contains the use flag '%s', which" + \ - " is not in IUSE") % (constraints, flag)) - - if (not_use_cons and flag in use) or \ - (not not_use_cons and not flag in use): - #we are at a use conditional and the use flag is in such a state, - #that we don't need to look at it. We add it to ignore here, because - #both sat and unsat would cause problems. I.e. A? ( B C? ( D ) ) - #If B is enabled and C is not and we'd put C? ( D ) in unsat, we would claim - #A? ( B C? ( D ) ) not be satisfied, which is wrong. - #I.e. A? ( !B C? ( D ) ) - #If B is enabled and C is not and we would put C? ( D ) in sat, we would claim that - #A? ( !B C? ( D ) ) is satisfied, which is wrong. - ignore.append([constraint, constraints[id+1]]) - else: - sub_sat, sub_unsat, sub_ignore = _check_required_use(constraints[id+1], use, iuse) - if sub_unsat or not sub_sat: - #We need all sub constraints satisifed. Be aware of cases like A? ( B? ( C ) ), - #when B is disabled. - unsat.append([constraint, constraints[id+1]]) - else: - sat.append([constraint, constraints[id+1]]) - elif constraint in ("||", "^^"): - skip_next = True - sub_sat, sub_unsat, sub_ignore = _check_required_use(constraints[id+1], use, iuse) - if (constraint=="||" and sub_sat) or (constraint=="^^" and len(sub_sat)==1): - sat.append([constraint, constraints[id+1]]) - else: - unsat.append([constraint, constraints[id+1]]) + def is_active(token): + if token.startswith("!"): + flag = token[1:] + is_negated = True else: - #a simple use flag i.e. A or !A - if constraint[0] == "!": - flag = constraint[1:] - not_operator = True - else: - flag = constraint - not_operator = False - - if not flag in iuse: - raise portage.exception.InvalidRequiredUseString( - ("check_required_use(): '%s' contains the use flag '%s', which" + \ - " is not in IUSE") % (constraints, flag)) - - if (not_operator and flag not in use) or \ - (not not_operator and constraint in use): - sat.append([constraint]) - else: - unsat.append([constraint]) + flag = token + is_negated = False - return sat, unsat, ignore + if not flag or not flag in iuse: + raise portage.exception.InvalidDependString( + _("malformed syntax: '%s'") % required_use) -def check_required_use(required_use, use, iuse): - """ - Checks if the use flags listed in 'use' satisfy all - constraints specified in 'required_use'. Returns a tuple - containing strings representing satisfied and unsatisfied - constraints. + return (flag in use and not is_negated) or \ + (flag not in use and is_negated) + + def is_satisfied(operator, argument): + if not argument: + #|| ( ) -> True + return True - @param required_use: REQUIRED_USE as defined by the ebuild - @type required_use: String - @param use: Enabled use flags - @param use: List - @param iuse: Referenceable use flags - @param iuse: List - @rtype: Tuple of two strings - @return: all satisifed constraints, all unsatisfied constraints, - """ - try: - sat, unsat, ignore = _check_required_use(paren_reduce(required_use), use, iuse) - except portage.exception.InvalidDependString as e: - raise portage.exception.InvalidRequiredUseString(str(e)) + if operator == "||": + return (True in argument) + elif operator == "^^": + return (argument.count(True) == 1) + elif operator[-1] == "?": + return (False not in argument) + + mysplit = required_use.split() + level = 0 + stack = [[]] + need_bracket = False + + for token in mysplit: + if token == "(": + need_bracket = False + stack.append([]) + level += 1 + elif token == ")": + if need_bracket: + raise portage.exception.InvalidDependString( + _("malformed syntax: '%s'") % required_use) + if level > 0: + level -= 1 + l = stack.pop() + ignore = False + if stack[level]: + if stack[level][-1] in ("||", "^^"): + ignore = True + op = stack[level].pop() + stack[level].append(is_satisfied(op, l)) + elif not isinstance(stack[level][-1], bool) and \ + stack[level][-1][-1] == "?": + if is_active(stack[level][-1][:-1]): + op = stack[level].pop() + stack[level].append(is_satisfied(op, l)) + else: + stack[level].pop() + ignore = True + + if l and not ignore: + stack[level].extend(l) + else: + raise portage.exception.InvalidDependString( + _("malformed syntax: '%s'") % required_use) + elif token in ("||", "^^"): + if need_bracket: + raise portage.exception.InvalidDependString( + _("malformed syntax: '%s'") % required_use) + need_bracket = True + stack[level].append(token) + else: + if need_bracket or "(" in token or ")" in token or \ + "|" in token or "^" in token: + raise portage.exception.InvalidDependString( + _("malformed syntax: '%s'") % required_use) + + if token[-1] == "?": + need_bracket = True + stack[level].append(token) + else: + stack[level].append(is_active(token)) + + if level != 0 or need_bracket: + raise portage.exception.InvalidDependString( + _("malformed syntax: '%s'") % required_use) - return paren_enclose(sat + ignore), paren_enclose(unsat) + return (False not in stack[0]) diff --git a/pym/portage/exception.py b/pym/portage/exception.py index 740a38155..f8388e2b6 100644 --- a/pym/portage/exception.py +++ b/pym/portage/exception.py @@ -32,9 +32,6 @@ class CorruptionError(PortageException): class InvalidDependString(PortageException): """An invalid depend string has been encountered""" -class InvalidRequiredUseString(PortageException): - """An invalid depend string has been encountered""" - class InvalidVersionString(PortageException): """An invalid version string has been encountered""" diff --git a/pym/portage/tests/dep/testCheckRequiredUse.py b/pym/portage/tests/dep/testCheckRequiredUse.py new file mode 100644 index 000000000..14ceb5d22 --- /dev/null +++ b/pym/portage/tests/dep/testCheckRequiredUse.py @@ -0,0 +1,93 @@ +# Copyright 2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +from portage.tests import TestCase +from portage.dep import check_required_use +from portage.exception import InvalidDependString + +class TestCheckRequiredUse(TestCase): + + def testCheckRequiredUse(self): + test_cases = ( + ( "|| ( a b )", [], ["a", "b"], False), + ( "|| ( a b )", ["a"], ["a", "b"], True), + ( "|| ( a b )", ["b"], ["a", "b"], True), + ( "|| ( a b )", ["a", "b"], ["a", "b"], True), + + ( "^^ ( a b )", [], ["a", "b"], False), + ( "^^ ( a b )", ["a"], ["a", "b"], True), + ( "^^ ( a b )", ["b"], ["a", "b"], True), + ( "^^ ( a b )", ["a", "b"], ["a", "b"], False), + + ( "^^ ( || ( a b ) c )", [], ["a", "b", "c"], False), + ( "^^ ( || ( a b ) c )", ["a"], ["a", "b", "c"], True), + + ( "^^ ( || ( ( a b ) ) ( c ) )", [], ["a", "b", "c"], False), + #~ ( "( ^^ ( ( || ( ( a ) ( b ) ) ) ( ( c ) ) ) )", ["a"], ["a", "b", "c"], True), + + ( "a || ( b c )", ["a"], ["a", "b", "c"], False), + ( "|| ( b c ) a", ["a"], ["a", "b", "c"], False), + + ( "|| ( a b c )", ["a"], ["a", "b", "c"], True), + ( "|| ( a b c )", ["b"], ["a", "b", "c"], True), + ( "|| ( a b c )", ["c"], ["a", "b", "c"], True), + + ( "^^ ( a b c )", ["a"], ["a", "b", "c"], True), + ( "^^ ( a b c )", ["b"], ["a", "b", "c"], True), + ( "^^ ( a b c )", ["c"], ["a", "b", "c"], True), + ( "^^ ( a b c )", ["a", "b"], ["a", "b", "c"], False), + ( "^^ ( a b c )", ["b", "c"], ["a", "b", "c"], False), + ( "^^ ( a b c )", ["a", "c"], ["a", "b", "c"], False), + ( "^^ ( a b c )", ["a", "b", "c"], ["a", "b", "c"], False), + + ( "a? ( ^^ ( b c ) )", [], ["a", "b", "c"], True), + ( "a? ( ^^ ( b c ) )", ["a"], ["a", "b", "c"], False), + ( "a? ( ^^ ( b c ) )", ["b"], ["a", "b", "c"], True), + ( "a? ( ^^ ( b c ) )", ["c"], ["a", "b", "c"], True), + ( "a? ( ^^ ( b c ) )", ["a", "b"], ["a", "b", "c"], True), + ( "a? ( ^^ ( b c ) )", ["a", "b", "c"], ["a", "b", "c"], False), + + ( "^^ ( a? ( !b ) !c? ( d ) )", [], ["a", "b", "c", "d"], False), + ( "^^ ( a? ( !b ) !c? ( d ) )", ["a"], ["a", "b", "c", "d"], True), + ( "^^ ( a? ( !b ) !c? ( d ) )", ["c"], ["a", "b", "c", "d"], True), + ( "^^ ( a? ( !b ) !c? ( d ) )", ["a", "c"], ["a", "b", "c", "d"], True), + ( "^^ ( a? ( !b ) !c? ( d ) )", ["a", "b", "c"], ["a", "b", "c", "d"], False), + ( "^^ ( a? ( !b ) !c? ( d ) )", ["a", "b", "d"], ["a", "b", "c", "d"], True), + ( "^^ ( a? ( !b ) !c? ( d ) )", ["a", "b", "d"], ["a", "b", "c", "d"], True), + ( "^^ ( a? ( !b ) !c? ( d ) )", ["a", "d"], ["a", "b", "c", "d"], False), + + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", [], ["a", "b", "c"], False), + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", ["a"], ["a", "b", "c"], True), + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", ["b"], ["a", "b", "c"], True), + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", ["c"], ["a", "b", "c"], True), + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", ["a", "b"], ["a", "b", "c"], True), + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", ["a", "c"], ["a", "b", "c"], True), + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", ["b", "c"], ["a", "b", "c"], True), + ( "|| ( ^^ ( a b ) ^^ ( b c ) )", ["a", "b", "c"], ["a", "b", "c"], False), + + ( "^^ ( || ( a b ) ^^ ( b c ) )", [], ["a", "b", "c"], False), + ( "^^ ( || ( a b ) ^^ ( b c ) )", ["a"], ["a", "b", "c"], True), + ( "^^ ( || ( a b ) ^^ ( b c ) )", ["b"], ["a", "b", "c"], False), + ( "^^ ( || ( a b ) ^^ ( b c ) )", ["c"], ["a", "b", "c"], True), + ( "^^ ( || ( a b ) ^^ ( b c ) )", ["a", "b"], ["a", "b", "c"], False), + ( "^^ ( || ( a b ) ^^ ( b c ) )", ["a", "c"], ["a", "b", "c"], False), + ( "^^ ( || ( a b ) ^^ ( b c ) )", ["b", "c"], ["a", "b", "c"], True), + ( "^^ ( || ( a b ) ^^ ( b c ) )", ["a", "b", "c"], ["a", "b", "c"], True), + ) + + test_cases_xfail = ( + ( "^^ ( || ( a b ) ^^ ( b c ) )", [], ["a", "b"]), + ( "^^ ( || ( a b ) ^^ ( b c )", [], ["a", "b", "c"]), + ( "^^( || ( a b ) ^^ ( b c ) )", [], ["a", "b", "c"]), + ( "^^ || ( a b ) ^^ ( b c )", [], ["a", "b", "c"]), + ( "^^ ( ( || ) ( a b ) ^^ ( b c ) )", [], ["a", "b", "c"]), + ( "^^ ( || ( a b ) ) ^^ ( b c ) )", [], ["a", "b", "c"]), + ) + + for required_use, use, iuse, expected in test_cases: + self.assertEqual(check_required_use(required_use, use, iuse), \ + expected, required_use + ", USE = " + " ".join(use)) + + for required_use, use, iuse in test_cases_xfail: + self.assertRaisesMsg(required_use + ", USE = " + " ".join(use), \ + InvalidDependString, check_required_use, required_use, use, iuse) |