Skip to content

Commit cc76587

Browse files
committed
Use the correct "home" directory for rabbit in rabbitmq_home.bzl
(cherry picked from commit 2f69eaf)
1 parent badd372 commit cc76587

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

rabbitmq_home.bzl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,7 @@ def _dirname(p):
147147
return p.rpartition("/")[0]
148148

149149
def rabbitmq_home_short_path(rabbitmq_home):
150-
info = rabbitmq_home[RabbitmqHomeInfo]
151-
return _dirname(_dirname(info.sbin[0].short_path))
150+
short_path = rabbitmq_home[RabbitmqHomeInfo].sbin[0].short_path
151+
if rabbitmq_home.label.workspace_root != "":
152+
short_path = path_join(rabbitmq_home.label.workspace_root, short_path)
153+
return _dirname(_dirname(short_path))

0 commit comments

Comments
 (0)