diff options
| author |  Googler <noreply@google.com> | 2016-11-03 22:31:23 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2016-11-04 09:22:43 +0000 |
| commit | ffb4c0ce0e7cc36e9219dfb9eed570023234bb0c (patch) | |
| tree | 4e704d86f719999e0d5f67797ead21c63bec590d /src/tools/android/java/com | |
| parent | 62c57c749eb31252a6948d6af03c125aa3ed5dd8 (diff) | |
Fix target info in conflict error message, to avoid toString on objects
that don't implement it.
--
MOS_MIGRATED_REVID=138126904
Diffstat (limited to 'src/tools/android/java/com')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/MergeConflict.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java index 4992da61ae..cbaa642fab 100644 --- a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java +++ b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java @@ -29,7 +29,7 @@ import java.util.Objects; @Immutable public class MergeConflict { private static final String CONFLICT_MESSAGE = "\n\u001B[31mCONFLICT:\u001B[0m" - + " %s is provided with ambiguous priority from: \n\t%s\n\t%s"; + + " %s is provided with ambiguous priority from:\n\t%s\n\t%s"; private final DataKey dataKey; private final DataValue first; @@ -66,7 +66,8 @@ public class MergeConflict { public String toConflictMessage() { return String.format( - CONFLICT_MESSAGE, dataKey.toPrettyString(), first.source(), second.source()); + CONFLICT_MESSAGE, dataKey.toPrettyString(), first.source().getPath(), + second.source().getPath()); } public DataKey dataKey() { |