summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2021-09-08 16:56:05 +0200
committerPhilip Kuryloski <kuryloskip@vmware.com>2021-09-08 16:56:05 +0200
commit2f69eaf7ebbebd1169322da08d1df2fa699c9713 (patch)
tree5b88b08ead48dd109cef2937b0634bdc3a567c1f
parenteec4a042893abee0d5d156207069011f28e692bd (diff)
downloadrabbitmq-server-git-2f69eaf7ebbebd1169322da08d1df2fa699c9713.tar.gz
Use the correct "home" directory for rabbit in rabbitmq_home.bzl
-rw-r--r--rabbitmq_home.bzl6
1 files changed, 4 insertions, 2 deletions
diff --git a/rabbitmq_home.bzl b/rabbitmq_home.bzl
index 3471da76e1..5d34441450 100644
--- a/rabbitmq_home.bzl
+++ b/rabbitmq_home.bzl
@@ -147,5 +147,7 @@ def _dirname(p):
return p.rpartition("/")[0]
def rabbitmq_home_short_path(rabbitmq_home):
- info = rabbitmq_home[RabbitmqHomeInfo]
- return _dirname(_dirname(info.sbin[0].short_path))
+ short_path = rabbitmq_home[RabbitmqHomeInfo].sbin[0].short_path
+ if rabbitmq_home.label.workspace_root != "":
+ short_path = path_join(rabbitmq_home.label.workspace_root, short_path)
+ return _dirname(_dirname(short_path))