summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2013-05-24 18:48:50 (GMT)
committerSebastian Dröge <slomo@circular-chaos.org>2013-05-24 18:48:50 (GMT)
commitd8477411f7445c3c786a464b8d4818dcf210c287 (patch)
tree5f6b134df6ca024ce5d0ccbcd2598169b92261a1
parente10f03592599645cdf9e26ed946ad1cd02d72cfb (diff)
downloadcerbero-d8477411f7445c3c786a464b8d4818dcf210c287.tar.gz
cerbero-d8477411f7445c3c786a464b8d4818dcf210c287.tar.xz
glib-networking: Don't raise FatalError in prepare() if a dependency is not built yet
-rw-r--r--recipes/glib-networking-static.recipe8
-rw-r--r--recipes/glib-networking.recipe8
2 files changed, 2 insertions, 14 deletions
diff --git a/recipes/glib-networking-static.recipe b/recipes/glib-networking-static.recipe
index cc618b7..1ed778c 100644
--- a/recipes/glib-networking-static.recipe
+++ b/recipes/glib-networking-static.recipe
@@ -22,15 +22,9 @@ class Recipe(recipe.Recipe):
if self.config.target_platform in [Platform.DARWIN, Platform.IOS]:
# For the universal build we need to use the right gio-querymodules
arch = self.config.target_arch
-
querymodule_path = os.path.join(self.config.prefix, arch, 'bin', 'gio-querymodules')
- if not os.path.exists(querymodule_path):
- querymodule_path = None
-
- if not querymodule_path:
+ else:
querymodule_path = os.path.join(self.config.prefix, 'bin', 'gio-querymodules')
- if not os.path.exists(querymodule_path):
- raise FatalError("Could not find gio-querymodules")
if not self.config.prefix_is_executable():
querymodule_path = 'true'
diff --git a/recipes/glib-networking.recipe b/recipes/glib-networking.recipe
index 230a247..1f953b3 100644
--- a/recipes/glib-networking.recipe
+++ b/recipes/glib-networking.recipe
@@ -18,15 +18,9 @@ class Recipe(recipe.Recipe):
if self.config.target_platform in [Platform.DARWIN, Platform.IOS]:
# For the universal build we need to use the right gio-querymodules
arch = self.config.target_arch
-
querymodule_path = os.path.join(self.config.prefix, arch, 'bin', 'gio-querymodules')
- if not os.path.exists(querymodule_path):
- querymodule_path = None
-
- if not querymodule_path:
+ else:
querymodule_path = os.path.join(self.config.prefix, 'bin', 'gio-querymodules')
- if not os.path.exists(querymodule_path):
- raise FatalError("Could not find gio-querymodules")
if not self.config.prefix_is_executable():
querymodule_path = 'true'