diff options
author | kush <kush@google.com> | 2017-10-05 23:05:51 +0200 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2017-10-06 19:48:14 +0200 |
commit | 104eb04bc709859a31079e77b397d3efa786968f (patch) | |
tree | 350f678fde1298a5bbefe679166768b6a8f190c7 /src/main/java/com/google/devtools/build | |
parent | 211934ba47b27e83aed68b9a4bcbb99fe2892af5 (diff) |
Fix the strict-ordering of symlinks created with Filesets which was inadvartently lost due to https://github.com/bazelbuild/bazel/commit/d8ba904a3b0598e97601bc670840e39f21799ead
RELNOTES: none
PiperOrigin-RevId: 171204884
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java index 5dbed59c10..064ab4ba65 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java @@ -71,13 +71,14 @@ public final class FilesetEntryFunction implements SkyFunction { // The absence of "direct" traversal indicates the presence of a "nested" fileset and // getNestedTraversal will return the list FilesetTraversalParams corresponding to each // FilesetEntry of the nested Fileset. - Map<SkyKey, SkyValue> results = env.getValues(FilesetEntryValue.keys(t.getNestedTraversal())); + ImmutableList<SkyKey> nestedKeys = FilesetEntryValue.keys(t.getNestedTraversal()); + Map<SkyKey, SkyValue> results = env.getValues(nestedKeys); if (env.valuesMissing()) { return null; } - for (SkyValue value : results.values()) { - FilesetEntryValue nested = (FilesetEntryValue) value; + for (SkyKey nestedKey : nestedKeys) { + FilesetEntryValue nested = (FilesetEntryValue) results.get(nestedKey); for (FilesetOutputSymlink s : nested.getSymlinks()) { if (!exclusions.contains(s.name.getPathString())) { maybeStoreSymlink(s, t.getDestPath(), outputSymlinks); |