check_required_use: Fix the same bug as in use_reduce

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 5b047338918a79995db3bda0656d529be6221064..8bbcd3e59394ea220d44ca652fc1cfe60e356d52 100644 (file)
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -1735,7 +1735,7 @@ def check_required_use(required_use, use, iuse_match):
                                                ignore = True
 
                                if l and not ignore:
-                                       stack[level].extend(l)
+                                       stack[level].append(all(x for x in l))
                        else:
                                raise portage.exception.InvalidDependString(
                                        _("malformed syntax: '%s'") % required_use)

diff --git a/pym/portage/tests/dep/testCheckRequiredUse.py b/pym/portage/tests/dep/testCheckRequiredUse.py
index 9468ca394d72f3bc17a3e761f4e5e2dedcf0f55c..4b67d62500ede769c2d6d611afa3877cf12531ba 100644 (file)
--- a/pym/portage/tests/dep/testCheckRequiredUse.py
+++ b/pym/portage/tests/dep/testCheckRequiredUse.py
@@ -73,6 +73,24 @@ class TestCheckRequiredUse(TestCase):
                        ( "^^ ( || ( 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),
+
+                       ( "|| ( ( a b ) c )", ["a", "b", "c"], ["a", "b", "c"], True),
+                       ( "|| ( ( a b ) c )", ["b", "c"], ["a", "b", "c"], True),
+                       ( "|| ( ( a b ) c )", ["a", "c"], ["a", "b", "c"], True),
+                       ( "|| ( ( a b ) c )", ["a", "b"], ["a", "b", "c"], True),
+                       ( "|| ( ( a b ) c )", ["a"], ["a", "b", "c"], False),
+                       ( "|| ( ( a b ) c )", ["b"], ["a", "b", "c"], False),
+                       ( "|| ( ( a b ) c )", ["c"], ["a", "b", "c"], True),
+                       ( "|| ( ( a b ) c )", [], ["a", "b", "c"], False),
+
+                       ( "^^ ( ( a b ) c )", ["a", "b", "c"], ["a", "b", "c"], False),
+                       ( "^^ ( ( a b ) c )", ["b", "c"], ["a", "b", "c"], True),
+                       ( "^^ ( ( a b ) c )", ["a", "c"], ["a", "b", "c"], True),
+                       ( "^^ ( ( a b ) c )", ["a", "b"], ["a", "b", "c"], True),
+                       ( "^^ ( ( a b ) c )", ["a"], ["a", "b", "c"], False),
+                       ( "^^ ( ( a b ) c )", ["b"], ["a", "b", "c"], False),
+                       ( "^^ ( ( a b ) c )", ["c"], ["a", "b", "c"], True),
+                       ( "^^ ( ( a b ) c )", [], ["a", "b", "c"], False),
                )
 
                test_cases_xfail = (