diff options
| author | Marco Miller <marco.miller@ericsson.com> | 2020-11-30 11:35:18 -0500 |
|---|---|---|
| committer | Marco Miller <marco.miller@ericsson.com> | 2020-11-30 11:35:18 -0500 |
| commit | 87e16c0b90d525e40013d46ae73379fc4cd15659 (patch) | |
| tree | 725501c742d79effd4f3c5fccdf9bf2e35f53776 | |
| parent | 9b076ae734a9417a43f2fa367e584a4076aaf434 (diff) | |
| parent | 7e22ca2291656d1949f56ed1cdc00f0a54267656 (diff) | |
Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Fix bazel run_shell usage for newer versions
Change-Id: I8abcf83cb4886f18a340eda46e560a10e0060ebd
| -rw-r--r-- | tools/bzl/asciidoc.bzl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/bzl/asciidoc.bzl b/tools/bzl/asciidoc.bzl index 1e7ec96ce3..7977cf051d 100644 --- a/tools/bzl/asciidoc.bzl +++ b/tools/bzl/asciidoc.bzl @@ -18,8 +18,7 @@ def documentation_attributes(): ] def _replace_macros_impl(ctx): - cmd = [ - ctx.file._exe.path, + args = [ "--suffix", ctx.attr.suffix, "-s", @@ -28,13 +27,14 @@ def _replace_macros_impl(ctx): ctx.outputs.out.path, ] if ctx.attr.searchbox: - cmd.append("--searchbox") + args.append("--searchbox") else: - cmd.append("--no-searchbox") - ctx.actions.run_shell( + args.append("--no-searchbox") + ctx.actions.run( inputs = [ctx.file._exe, ctx.file.src], outputs = [ctx.outputs.out], - command = cmd, + executable = ctx.file._exe.path, + arguments = args, use_default_shell_env = True, progress_message = "Replacing macros in %s" % ctx.file.src.short_path, ) |