diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-09-30 17:27:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 17:27:05 +0200 |
| commit | 61640f87bed6ad97de07eba1e92bc0d90fe5e616 (patch) | |
| tree | 1d06e25098838c46a0dae6353dc4440acfa9d88a | |
| parent | 7d440d7270243a489540dd658384cd26709b956c (diff) | |
| parent | 0918c716ffa86634631ef0492dcb5803a88a6e7d (diff) | |
| download | rabbitmq-server-git-61640f87bed6ad97de07eba1e92bc0d90fe5e616.tar.gz | |
Merge pull request #3526 from rabbitmq/mergify/bp/v3.9.x/pr-3525
Fix handling of priv dirs for external deps (backport #3525)
| -rw-r--r-- | rabbitmq_home.bzl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/rabbitmq_home.bzl b/rabbitmq_home.bzl index a91e487c3d..6342d75f40 100644 --- a/rabbitmq_home.bzl +++ b/rabbitmq_home.bzl @@ -29,13 +29,17 @@ def _link_escript(ctx, escript): return s def _priv_file_dest_relative_path(plugin_label, f): - rel_base = plugin_label.package if plugin_label.workspace_root != "": - rel_base = path_join(plugin_label.workspace_root, rel_base) - if rel_base == "": - return f.path + if plugin_label.package != "": + rel_base = path_join(plugin_label.workspace_root, plugin_label.package) + else: + rel_base = plugin_label.workspace_root else: + rel_base = plugin_label.package + if rel_base != "": return f.path.replace(rel_base + "/", "") + else: + return f.path def _plugins_dir_links(ctx, plugin): lib_info = plugin[ErlangLibInfo] |