Fix crashing issue with WORKSPACE

Fixes bazelbuild#24498 RELNOTES: None PiperOrigin-RevId: 700720057 Change-Id: Ieb656821c41d5dde64c0807f2220f8b212267880
bazel-io · Nov 27, 2024 · dbb9457 · dbb9457
1 parent db91476
commit dbb9457
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RepoFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RepoFileFunction.java
@@ -75,6 +75,10 @@ public SkyValue compute(SkyKey skyKey, Environment env)
       if (repoDirValue == null) {
         return null;
       }
+      if (!repoDirValue.repositoryExists()) {
+        throw new RepoFileFunctionException(
+            new IOException(repoDirValue.getErrorMsg()), Transience.PERSISTENT);
+      }
       repoRoot = repoDirValue.getPath();
     }
     RootedPath repoFilePath =

diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
@@ -66,6 +66,10 @@ EOF
   assert_contains "bye" bazel-genfiles/external/x/out
 }
 
+function test_build_non_existing_repo() {
+  bazel build @blah &>$TEST_log && fail "Failure expected" || true
+  expect_log "Repository '@@blah' is not defined"
+}
 
 function test_path_with_spaces() {
   ws="a b"