From d81c123c371289b9c1d5c875776e78b09f2e60ad Mon Sep 17 00:00:00 2001 From: "bazel.build machine account" Date: Tue, 18 Feb 2025 21:34:39 +0100 Subject: [PATCH] [8.1.1] Fall back to `rctx.name` if `$original_name` is empty (#25310) The default for the attribute is the empty string, not `null`. Fixes #25286 Closes #25296. PiperOrigin-RevId: 728298504 Change-Id: Ibc7209e248c3abb57a5fb2487e7dab7202960bbd Commit https://github.com/bazelbuild/bazel/commit/fa7900a64c31427bddc1730a6b60178fa866fa6c Co-authored-by: Fabian Meumertzheim --- .../bazel/repository/starlark/StarlarkRepositoryContext.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java index 4da8c8598a4a85..c312b0c52331d9 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java @@ -17,6 +17,7 @@ import static java.nio.charset.StandardCharsets.ISO_8859_1; import com.github.difflib.patch.PatchFailedException; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.docgen.annot.DocCategory; import com.google.devtools.build.lib.analysis.BlazeDirectories; @@ -168,7 +169,7 @@ public String getOriginalName() { // backing Bazel modules. In case of the former, the original name is the same as the name, in // the latter the original name doesn't matter as the restricted set of rules that can back // Bazel modules do not use the name. - return originalName != null ? originalName : rule.getName(); + return Strings.isNullOrEmpty(originalName) ? rule.getName() : originalName; } @StarlarkMethod(