tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
2index 25fbdcac9d..49616d37df 100644
3--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
4+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
5@@ -568,22 +568,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
6 String content;
7 try {
8 content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
9- String markerRuleKey = readMarkerFile(content, markerData);
10- boolean verified = false;
11- if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)) {
12- verified = handler.verifyMarkerData(rule, markerData, env);
13- if (env.valuesMissing()) {
14- return null;
15- }
16- }
17-
18- if (verified) {
19- return new Fingerprint().addString(content).digestAndReset();
20- } else {
21- // So that we are in a consistent state if something happens while fetching the repository
22- markerPath.delete();
23- return null;
24- }
25+ return new Fingerprint().addString(content).digestAndReset();
26 } catch (IOException e) {
27 throw new RepositoryFunctionException(e, Transience.TRANSIENT);
28 }
29diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
30index 1a45b8a3a2..a6b73213f6 100644
31--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
32+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
33@@ -152,7 +152,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
34 ProcessBuilder builder = new ProcessBuilder();
35 builder.command(params.getArgv());
36 if (params.getEnv() != null) {
37- builder.environment().clear();
38 builder.environment().putAll(params.getEnv());
39 }
40