diff --git a/wlauto/core/resource.py b/wlauto/core/resource.py index ac2d31ca..59c1308c 100644 --- a/wlauto/core/resource.py +++ b/wlauto/core/resource.py @@ -38,8 +38,8 @@ class GetterPriority(object): """ cached = 20 preferred = 10 - remote = 5 environment = 0 + remote = -4 external_package = -5 package = -10 diff --git a/wlauto/resource_getters/standard.py b/wlauto/resource_getters/standard.py index b5c392d5..d4014073 100644 --- a/wlauto/resource_getters/standard.py +++ b/wlauto/resource_getters/standard.py @@ -227,7 +227,8 @@ class DependencyFileGetter(ResourceGetter): def get(self, resource, **kwargs): force = kwargs.get('force') remote_path = os.path.join(self.mount_point, self.relative_path, resource.path) - local_path = os.path.join(resource.owner.dependencies_directory, os.path.basename(resource.path)) + local_path = _f(os.path.join(settings.dependencies_directory, '__remote', + resource.owner.name, os.path.basename(resource.path))) if not os.path.exists(local_path) or force: if not os.path.exists(remote_path):