diff options
| author |  janakr <janakr@google.com> | 2018-02-26 15:54:57 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-26 15:57:11 -0800 |
| commit | 0175ce3630f15262172731e00e8413c534ed6a62 (patch) | |
| tree | 3adaa426206428f314dba5a0a4721f032ec1abc4 /src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusFunction.java | |
| parent | 8cfc6cd2f1165e52b28a858b849463998c0aa73d (diff) | |
Fail gracefully on conflicting actions generated by an aspect. These can come from Skylark, so we shouldn't crash. As a safety measure, subclasses of ActionLookupValue are now responsible for detecting action conflicts themselves.
PiperOrigin-RevId: 187095271
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusFunction.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusFunction.java index b231bae76a..68e6550c86 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusFunction.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.base.Preconditions; -import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyKey; @@ -27,15 +26,12 @@ public class WorkspaceStatusFunction implements SkyFunction { WorkspaceStatusAction create(String workspaceName); } - private final ActionKeyContext actionKeyContext; private final Supplier<Boolean> removeActionAfterEvaluation; private final WorkspaceStatusActionFactory workspaceStatusActionFactory; WorkspaceStatusFunction( - ActionKeyContext actionKeyContext, Supplier<Boolean> removeActionAfterEvaluation, WorkspaceStatusActionFactory workspaceStatusActionFactory) { - this.actionKeyContext = actionKeyContext; this.removeActionAfterEvaluation = Preconditions.checkNotNull(removeActionAfterEvaluation); this.workspaceStatusActionFactory = workspaceStatusActionFactory; } @@ -54,7 +50,6 @@ public class WorkspaceStatusFunction implements SkyFunction { workspaceStatusActionFactory.create(workspaceNameValue.getName()); return new WorkspaceStatusValue( - actionKeyContext, action.getStableStatus(), action.getVolatileStatus(), action, |