From 98b19328ded620171c7578e119f62c54524dd016 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Fri, 22 Jan 2016 11:58:54 +0000 Subject: [PATCH] Fixing assets discovery. - Two different parameters may now have the same global alias as long as their types match - `extension_asset` resource getter now picks up the path to the mouted filer from ``remote_assets_path`` global setting. --- wlauto/core/extension_loader.py | 4 ++-- wlauto/resource_getters/standard.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/wlauto/core/extension_loader.py b/wlauto/core/extension_loader.py index e9f2fd1c..533f5f08 100644 --- a/wlauto/core/extension_loader.py +++ b/wlauto/core/extension_loader.py @@ -80,8 +80,8 @@ class GlobalParameterAlias(object): other_param.kind != param.kind): message = 'Duplicate global alias {} declared in {} and {} extensions with different types' raise LoaderError(message.format(self.name, ext.name, other_ext.name)) - if param.name != other_param.name: - message = 'Two params {} in {} and {} in {} both declare global alias {}' + if param.kind != other_param.kind: + message = 'Two params {} in {} and {} in {} both declare global alias {}, and are of different kinds' raise LoaderError(message.format(param.name, ext.name, other_param.name, other_ext.name, self.name)) diff --git a/wlauto/resource_getters/standard.py b/wlauto/resource_getters/standard.py index 4df789a8..b4b8b771 100644 --- a/wlauto/resource_getters/standard.py +++ b/wlauto/resource_getters/standard.py @@ -180,17 +180,15 @@ class DependencyFileGetter(ResourceGetter): resource_type = 'file' relative_path = '' # May be overridden by subclasses. - default_mount_point = '/' priority = GetterPriority.remote parameters = [ - Parameter('mount_point', default='/', global_alias='filer_mount_point', + Parameter('mount_point', default='/', global_alias='remote_assets_path', description='Local mount point for the remote filer.'), ] def __init__(self, resolver, **kwargs): super(DependencyFileGetter, self).__init__(resolver, **kwargs) - self.mount_point = settings.filer_mount_point or self.default_mount_point def get(self, resource, **kwargs): force = kwargs.get('force') @@ -260,7 +258,6 @@ class ExtensionAssetGetter(DependencyFileGetter): name = 'extension_asset' resource_type = 'extension_asset' - relative_path = 'workload_automation/assets' class HttpGetter(ResourceGetter):