Skip to content

Commit f4c6e35

Browse files
authored
Merge pull request #135 from rmohr/fixes
Fix issues on bazeldnf and xattr rule invocations
2 parents 861ae38 + b583dad commit f4c6e35

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

internal/bazeldnf.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@bazel_skylib//lib:shell.bzl", "shell")
44
load("//bazeldnf:toolchain.bzl", "BAZELDNF_TOOLCHAIN")
55

66
def _bazeldnf_impl(ctx):
7-
transitive_dependencies = []
7+
transitive_dependencies = depset([])
88
out_file = ctx.actions.declare_file(ctx.label.name + ".bash")
99
args = []
1010
if ctx.attr.command:
@@ -15,7 +15,7 @@ def _bazeldnf_impl(ctx):
1515
args.extend(["--rpmtree", ctx.attr.rpmtree])
1616
if ctx.file.tar:
1717
args.extend(["--input", ctx.file.tar.path])
18-
transitive_dependencies.extend(ctx.attr.tar.files)
18+
transitive_dependencies = ctx.attr.tar.files
1919
args.extend(ctx.attr.libs)
2020

2121
toolchain = ctx.toolchains[BAZELDNF_TOOLCHAIN]
@@ -32,7 +32,7 @@ def _bazeldnf_impl(ctx):
3232
)
3333
runfiles = ctx.runfiles(
3434
files = [toolchain._tool],
35-
transitive_files = depset([], transitive = transitive_dependencies),
35+
transitive_files = depset([], transitive = [transitive_dependencies]),
3636
)
3737
return [DefaultInfo(
3838
files = depset([out_file]),

internal/xattrs.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def _xattrs_impl(ctx):
2323
if ctx.attr.capabilities:
2424
capabilities = []
2525
for k, v in ctx.attr.capabilities.items():
26-
capabilities.append([k + "=" + ":".join(v)])
26+
capabilities.append(k + "=" + ":".join(v))
2727
args += ["--capabilities", ",".join(capabilities)]
2828

2929
if ctx.attr.selinux_labels:

0 commit comments

Comments
 (0)