Made bootstrap recipe alternatives work

inclement · inclement · commit 6962a906c6c3 · 2016-02-14T21:32:28.000Z
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -138,19 +138,22 @@ def get_bootstrap_from_recipes(cls, recipes, ctx):
             ok = True
             if not bs.can_be_chosen_automatically:
                 ok = False
-            for recipe in bs.recipe_depends:
-                recipe = Recipe.get_recipe(recipe, ctx)
-                if any([conflict in recipes for conflict in recipe.conflicts]):
-                    ok = False
-                    break
-            for recipe in recipes:
-                recipe = Recipe.get_recipe(recipe, ctx)
-                if any([conflict in bs.recipe_depends
-                        for conflict in recipe.conflicts]):
-                    ok = False
-                    break
-            if ok:
-                acceptable_bootstraps.append(bs)
+            possible_dependency_lists = expand_dependencies(bs.recipe_depends)
+            for possible_dependencies in possible_dependency_lists:
+                ok = True
+                for recipe in possible_dependencies:
+                    recipe = Recipe.get_recipe(recipe, ctx)
+                    if any([conflict in recipes for conflict in recipe.conflicts]):
+                        ok = False
+                        break
+                for recipe in recipes:
+                    recipe = Recipe.get_recipe(recipe, ctx)
+                    if any([conflict in possible_dependencies
+                            for conflict in recipe.conflicts]):
+                        ok = False
+                        break
+                if ok:
+                    acceptable_bootstraps.append(bs)
         info('Found {} acceptable bootstraps: {}'.format(
             len(acceptable_bootstraps),
             [bs.name for bs in acceptable_bootstraps]))
@@ -264,3 +267,20 @@ def fry_eggs(self, sitepackages):
                 if files:
                     shprint(sh.mv, '-t', sitepackages, *files)
                 shprint(sh.rm, '-rf', d)
+
+
+def expand_dependencies(recipes):
+    recipe_lists = [[]]
+    for recipe in recipes:
+        if isinstance(recipe, (tuple, list)):
+            new_recipe_lists = []
+            for alternative in recipe:
+                for old_list in recipe_lists:
+                    new_list = [i for i in old_list]
+                    new_list.append(alternative)
+                    new_recipe_lists.append(new_list)
+            recipe_lists = new_recipe_lists
+        else:
+            for old_list in recipe_lists:
+                old_list.append(recipe)
+    return recipe_lists
diff --git a/pythonforandroid/logger.py b/pythonforandroid/logger.py
@@ -217,5 +217,3 @@ def printtail(out, name, forecolor, tail_n=0,
 
     return output
 
-
-from pythonforandroid.util import unistr

Original file line number	Diff line number	Diff line change
`@@ -217,5 +217,3 @@ def printtail(out, name, forecolor, tail_n=0,`
`217`	`217`
`218`	`218`	`return output`
`219`	`219`
`220`		`-`
`221`		`-from pythonforandroid.util import unistr`