Skip to content

Commit 5875ec2

Browse files
authored
Merge pull request github#16627 from github/criemen/pkg-fix-install
`pkg.bzl`: Fix install targets.
2 parents 51b000a + a42bdd9 commit 5875ec2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

misc/bazel/internal/install.py

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
for line in manifest:
5151
prefix, _, zip = line.partition(":")
5252
assert zip, f"missing prefix for {prefix}, you should use prefix:zip format"
53+
zip = zip.strip()
5354
dest = destdir / prefix
5455
dest.mkdir(parents=True, exist_ok=True)
5556
subprocess.run([ripunzip, "unzip-file", zip, "-d", dest], check=True)

misc/bazel/pkg.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ def codeql_pack(
357357
)
358358
py_binary(
359359
name = internal("installer"),
360-
srcs = ["//misc/bazel/internal:install.py"],
361-
main = "//misc/bazel/internal:install.py",
360+
srcs = [Label("//misc/bazel/internal:install.py")],
361+
main = Label("//misc/bazel/internal:install.py"),
362362
data = [
363363
internal("build-file"),
364364
internal("script"),
365365
] + ([
366366
internal("zip-manifest"),
367-
"//misc/bazel/internal/ripunzip",
367+
Label("//misc/bazel/internal/ripunzip"),
368368
] if zips else []),
369369
deps = ["@rules_python//python/runfiles"],
370370
args = [
@@ -373,7 +373,7 @@ def codeql_pack(
373373
"--destdir",
374374
install_dest,
375375
] + ([
376-
"--ripunzip=$(rlocationpath //misc/bazel/internal/ripunzip)",
376+
"--ripunzip=$(rlocationpath %s)" % Label("//misc/bazel/internal/ripunzip"),
377377
"--zip-manifest=$(rlocationpath %s)" % internal("zip-manifest"),
378378
] if zips else []),
379379
visibility = visibility,

0 commit comments

Comments
 (0)