aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2017-02-09 15:29:45 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2017-02-09 19:27:27 +0000
commitdcabfe636da3ea51f59ebad372253fec03e15118 (patch)
treef72b07219597cbbcf7cad7b27939fb3520a523e8 /src/main
parentf1813e48e42adfaa93ad1c6468cbc77f70d8df7f (diff)
Test output directory presence for skylark repositories without a FileValue
Using a FileValue depenendency was not needed and create over-invalidation of the repository. On a cold server, this duplicate the call to the repository function, including potential slow operation like downloads. -- Change-Id: Ie09fa45b2d77f8986f4a4e95d06e8133481aff50 Reviewed-on: https://cr.bazel.build/8138 PiperOrigin-RevId: 147032408 MOS_MIGRATED_REVID=147032408
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
index 08074827d7..0afc34585f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
@@ -23,7 +23,6 @@ import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.rules.repository.RepositoryDirectoryValue;
import com.google.devtools.build.lib.rules.repository.RepositoryFunction;
-import com.google.devtools.build.lib.skyframe.FileValue;
import com.google.devtools.build.lib.syntax.BaseFunction;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.Mutability;
@@ -117,14 +116,7 @@ public class SkylarkRepositoryFunction extends RepositoryFunction {
throw new RepositoryFunctionException(e, Transience.TRANSIENT);
}
- FileValue repositoryValue = getRepositoryDirectory(outputDirectory, env);
- if (repositoryValue == null) {
- // TODO(bazel-team): If this returns null, we unnecessarily recreate the symlink above on the
- // second execution.
- return null;
- }
-
- if (!repositoryValue.isDirectory()) {
+ if (!outputDirectory.isDirectory()) {
throw new RepositoryFunctionException(
new IOException(rule + " must create a directory"), Transience.TRANSIENT);
}