Treat missing repo boundary files as transient errors

bazelbuild · Jun 11, 2024 · 4e02e81 · 4e02e81
1 parent dc62a5f
commit 4e02e81
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/...main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
@@ -566,7 +566,7 @@ public static RepositoryDirectoryValue.Builder symlinkRepoRoot(
     if (!WorkspaceFileHelper.isValidRepoRoot(destination)) {
       throw new RepositoryFunctionException(
           new IOException("No MODULE.bazel, REPO.bazel, or WORKSPACE file found in " + destination),
-          Transience.PERSISTENT);
+          Transience.TRANSIENT);
     }
     return RepositoryDirectoryValue.builder().setExcludeFromVendoring(true).setPath(source);
   }

diff --git a/src/test/py/bazel/bzlmod/bazel_overrides_test.py b/src/test/py/bazel/bzlmod/bazel_overrides_test.py
@@ -513,6 +513,25 @@ def testCmdWorkspaceRelativeModuleOverride(self):
         'Target @@ss~//:choose_me up-to-date (nothing to build)', stderr
     )
 
+  def testLocalPathOverrideErrorResolved(self):
+    self.ScratchFile(
+      'MODULE.bazel',
+      [
+        'bazel_dep(name = "module")',
+        'local_path_override(',
+        '  module_name = "module",',
+        '  path = "module",',
+        ')',
+        ],
+    )
+    self.ScratchFile("module/BUILD")
+
+    # MODULE.bazel file is missing
+    stderr, _, exit_code = self.RunBazel(['build', '@module//:all'], allow_failure=True)
+    self.AssertNotExitCode(exit_code, 0, stderr)
+
+    self.ScratchFile("module/MODULE.bazel", ["module(name = 'module')"])
+    _, _, _ = self.RunBazel(['build', '@module//:all'])
 
 if __name__ == '__main__':
   absltest.main()