From 90ea2dd5691e38f495143b32321b7eeb66938501 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Tue, 30 Jun 2015 10:50:56 +0100 Subject: [PATCH] resource getter: look for executable resource in correct loction. Look in the bin/ directory under resource owner's dependencies directory as well as general dependencies bin. --- wlauto/resource_getters/standard.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wlauto/resource_getters/standard.py b/wlauto/resource_getters/standard.py index 547343aa..af02009c 100644 --- a/wlauto/resource_getters/standard.py +++ b/wlauto/resource_getters/standard.py @@ -150,9 +150,15 @@ class EnvironmentExecutableGetter(ExecutableGetter): name = 'env_exe_getter' def get(self, resource, **kwargs): - path = os.path.join(settings.environment_root, 'bin', resource.platform, resource.filename) - if os.path.isfile(path): - return path + paths = [ + os.path.join(settings.environment_root, 'bin', + resource.platform, resource.filename), + os.path.join(resource.owner.dependencies_directory, 'bin', + resource.platform, resource.filename), + ] + for path in paths: + if os.path.isfile(path): + return path class DependencyFileGetter(ResourceGetter):