1 files changed, 16 insertions, 8 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 80f1d419a7..777794654f 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
@@ -31,7 +31,6 @@ import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyFunctionException;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -190,15 +189,21 @@ public final class FilesetEntryFunction implements SkyFunction {
     return FilesetEntryValue.of(ImmutableSet.copyOf(outputSymlinks.values()));
   }
 
-  /** Stores an output symlink unless it's excluded or would overwrite an existing one. */
-  private static void maybeStoreSymlink(FilesetOutputSymlink nestedLink, PathFragment destPath,
+  /** Stores an output symlink unless it would overwrite an existing one. */
+  private static void maybeStoreSymlink(
+      FilesetOutputSymlink nestedLink,
+      PathFragment destPath,
       Map<PathFragment, FilesetOutputSymlink> result) {
     maybeStoreSymlink(nestedLink.name, nestedLink.target, nestedLink.metadata, destPath, result);
   }
 
-  /** Stores an output symlink unless it's excluded or would overwrite an existing one. */
-  private static void maybeStoreSymlink(PathFragment linkName, PathFragment linkTarget,
-      String metadata, PathFragment destPath, Map<PathFragment, FilesetOutputSymlink> result) {
+  /** Stores an output symlink unless it would overwrite an existing one. */
+  private static void maybeStoreSymlink(
+      PathFragment linkName,
+      PathFragment linkTarget,
+      String metadata,
+      PathFragment destPath,
+      Map<PathFragment, FilesetOutputSymlink> result) {
     linkName = destPath.getRelative(linkName);
     if (!result.containsKey(linkName)) {
       result.put(linkName, new FilesetOutputSymlink(linkName, linkTarget, metadata));
@@ -237,11 +242,14 @@ public final class FilesetEntryFunction implements SkyFunction {
   private static String createErrorInfo(FilesetTraversalParams t) {
     if (t.getDirectTraversal().isPresent()) {
       DirectTraversal direct = t.getDirectTraversal().get();
-      return String.format("Fileset '%s' traversing %s '%s'", t.getOwnerLabel(),
+      return String.format(
+          "Fileset '%s' traversing %s '%s'",
+          t.getOwnerLabelForErrorMessages(),
           direct.isPackage() ? "package" : "file (or directory)",
           direct.getRoot().getRelativePart().getPathString());
     } else {
-      return String.format("Fileset '%s' traversing another Fileset", t.getOwnerLabel());
+      return String.format(
+          "Fileset '%s' traversing another Fileset", t.getOwnerLabelForErrorMessages());
     }
   }