From 5b26a65c922c580b635cdd303939cfe93a8da59c Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 14 Nov 2023 14:59:23 +0100 Subject: [PATCH] Fix tar2files bazel integration The names that are passed to bazeldnf need to include the directory part too, otherwise having two files with the same name in different paths triggers a failure: + bazel run --config x86_64 //rpm:sandbox_s390x ... Error in _tar2files: generated file 'cc-toolchain_s390x/errno.h' in rule 'cc-toolchain_s390x/usr/include/asm' conflicts with existing generated file from rule 'cc-toolchain_s390x/usr/include' Signed-off-by: Andrea Bolognani --- internal/rpmtree.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpmtree.bzl b/internal/rpmtree.bzl index eb5a7a1..c4fe8aa 100644 --- a/internal/rpmtree.bzl +++ b/internal/rpmtree.bzl @@ -126,7 +126,7 @@ def tar2files(**kwargs): name = basename + k files = [] for file in v: - files = files + [basename + "/" + file] + files = files + [name + "/" + file] _tar2files( name = name, prefix = k,