Skip to content

Commit a05b66a

Browse files
authored
Merge pull request kivy#1064 from inclement/fix_recipe_graph
Rewrite recipe graph
2 parents d34fb93 + 3dd3fa7 commit a05b66a

File tree

2 files changed

+153
-213
lines changed

2 files changed

+153
-213
lines changed

pythonforandroid/bootstrap.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Bootstrap(object):
2727
dist_name = None
2828
distribution = None
2929

30-
recipe_depends = []
30+
recipe_depends = ['sdl2']
3131

3232
can_be_chosen_automatically = True
3333
'''Determines whether the bootstrap can be chosen as one that
@@ -150,9 +150,14 @@ def get_bootstrap_from_recipes(cls, recipes, ctx):
150150
ok = False
151151
break
152152
for recipe in recipes:
153-
recipe = Recipe.get_recipe(recipe, ctx)
153+
try:
154+
recipe = Recipe.get_recipe(recipe, ctx)
155+
except IOError:
156+
conflicts = []
157+
else:
158+
conflicts = recipe.conflicts
154159
if any([conflict in possible_dependencies
155-
for conflict in recipe.conflicts]):
160+
for conflict in conflicts]):
156161
ok = False
157162
break
158163
if ok:

0 commit comments

Comments
 (0)