commit 34665153f766b3e9313b2f7c2bbe86e93212b81d
author Klaus Aehlig <aehlig@google.com> Thu Jul 04 08:06:34 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jul 04 08:07:32 2019 -0700
tree ee7c19f7d6c4fbd656ca80235508ca98ea623c16
parent 475db53bd30b7d23c4fcbec51b441ecb576049bb

SkyframeDependencyResolver: fix use of String.format

When using format strings, the format string itself should only
contain the interpolation directives, and not also interpolated
strings which might contain character sequences signifying
interpolation directives themselves. Fix this.

Fixes #8795

Change-Id: Iad69323e580135585e29897876a95e9b04458cdc
PiperOrigin-RevId: 256553397

src/main/java/com/google/devtools/build/lib/skyframe/SkyframeDependencyResolver.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeDependencyResolver.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeDependencyResolver.java
index f8fd2e2..b72e89a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeDependencyResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeDependencyResolver.java
@@ -143,11 +143,11 @@
                   Event.error(
                       TargetUtils.getLocationMaybe(fromTarget),
                       String.format(
-                          "%s depends on %s in repository %s which failed to fetch. "
-                              + e.getMessage(),
+                          "%s depends on %s in repository %s which failed to fetch. %s",
                           fromTarget.getLabel(),
                           label,
-                          label.getPackageIdentifier().getRepository())));
+                          label.getPackageIdentifier().getRepository(),
+                          e.getMessage())));
           continue;
         }
         rootCauses.add(new LoadingFailedCause(label, e.getMessage()));