From 86f0b8e823ece444a0386e89ca3ee926ea3694b6 Mon Sep 17 00:00:00 2001 From: "bazel.build machine account" Date: Tue, 21 Jan 2025 14:07:49 +0100 Subject: [PATCH] [7.5.0] Remove no-op `--block_for_lock` command option (#25000) This option, which is different from the startup option of the same name, has no effect and doesn't even show a warning, which can be confusing. Closes #24953. PiperOrigin-RevId: 717853503 Change-Id: I8d7d1229f692007c4350b6c15526b7a95bbed5ef Commit https://github.com/bazelbuild/bazel/commit/79508becbb9195dc59e24b9aa3dbaf880c209e2e Co-authored-by: Fabian Meumertzheim --- .../build/lib/runtime/CommonCommandOptions.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java index 270d1116a8723a..5ac89be2952321 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java @@ -435,17 +435,6 @@ public String getTypeDescription() { help = "Enable processing of + parameters.") public boolean allowProjectFiles; - @Option( - name = "block_for_lock", - defaultValue = "true", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION}, - metadataTags = {OptionMetadataTag.HIDDEN}, - help = - "If set (the default), a command will block if there is another one running. If " - + "unset, these commands will immediately return with an error.") - public boolean blockForLock; - // We could accept multiple of these, in the event where there's a chain of tools that led to a // Bazel invocation. We would not want to expect anything from the order of these, and would need // to guarantee that the "label" for each command line is unique. Unless a need is demonstrated,