Skip to content

Commit ff00bd3

Browse files
committed
fix zipapp build_manifest bad arg
1 parent e301c14 commit ff00bd3

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

python/private/zipapp/py_zipapp_rule.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def _create_zipapp_main_py(ctx, py_runtime, py_executable, stage2_bootstrap, run
5555

5656
inputs = builders.DepsetBuilder()
5757
inputs.add(py_runtime.zip_main_template)
58-
_build_manifest(ctx, hash_files_manifest, runfiles, None, explicit_symlinks)
58+
_build_manifest(ctx, hash_files_manifest, runfiles, explicit_symlinks)
5959

6060
actions_run(
6161
ctx,
@@ -83,7 +83,7 @@ def _map_zip_root_symlinks(entry):
8383
def _map_explicit_symlinks(entry):
8484
return "symlink|" + entry.runfiles_path + "|" + entry.link_to_path
8585

86-
def _build_manifest(ctx, manifest, runfiles, inputs=None, explicit_symlinks):
86+
def _build_manifest(ctx, manifest, runfiles, explicit_symlinks, inputs = None):
8787
manifest.add_all(
8888
# NOTE: Accessing runfiles.empty_filenames materializes them. A lambda
8989
# is used to defer that.
@@ -95,7 +95,7 @@ def _build_manifest(ctx, manifest, runfiles, inputs=None, explicit_symlinks):
9595
manifest.add_all(runfiles.files, map_each = _map_zip_runfiles)
9696
manifest.add_all(runfiles.symlinks, map_each = _map_zip_symlinks)
9797
manifest.add_all(runfiles.root_symlinks, map_each = _map_zip_root_symlinks)
98-
manifest.add_all(explicit_symlinks, _map_explicit_symlinks)
98+
manifest.add_all(explicit_symlinks, map_each = _map_explicit_symlinks)
9999

100100
if inputs:
101101
inputs.add(runfiles.files)
@@ -148,7 +148,7 @@ def _create_zip(ctx, py_runtime, py_executable, stage2_bootstrap):
148148
inputs = builders.DepsetBuilder()
149149
manifest.add("regular|0|__main__.py|{}".format(zip_main.path))
150150
inputs.add(zip_main)
151-
_build_manifest(ctx, manifest, runfiles, inputs, py_executable.venv_interpreter_symlinks)
151+
_build_manifest(ctx, manifest, runfiles, py_executable.venv_interpreter_symlinks, inputs)
152152

153153
zipper_args = ctx.actions.args()
154154
zipper_args.add(output)

0 commit comments

Comments
 (0)