Merge pull request #1064 from inclement/fix_recipe_graph

Rewrite recipe graph
kivy · Jun 24, 2017 · a05b66a · a05b66a
2 parents d34fb93 + 3dd3fa7
commit a05b66a
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 213 deletions.
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -27,7 +27,7 @@ class Bootstrap(object):
     dist_name = None
     distribution = None
 
-    recipe_depends = []
+    recipe_depends = ['sdl2']
 
     can_be_chosen_automatically = True
     '''Determines whether the bootstrap can be chosen as one that
@@ -150,9 +150,14 @@ def get_bootstrap_from_recipes(cls, recipes, ctx):
                         ok = False
                         break
                 for recipe in recipes:
-                    recipe = Recipe.get_recipe(recipe, ctx)
+                    try:
+                        recipe = Recipe.get_recipe(recipe, ctx)
+                    except IOError:
+                        conflicts = []
+                    else:
+                        conflicts = recipe.conflicts
                     if any([conflict in possible_dependencies
-                            for conflict in recipe.conflicts]):
+                            for conflict in conflicts]):
                         ok = False
                         break
                 if ok: