aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
diff options
context:
space:
mode:
authorGravatar Gregg Donovan <greggny3@gmail.com>2017-08-09 16:38:43 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-08-10 13:42:06 +0200
commita2fed4b4a17a86dc663031d4c89a0fc15c64a440 (patch)
treea9cff7f708ec5161611999a5787d4188bd6c38b4 /src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
parentb31fe4829566be077a6558b570bf4c27389a3a2a (diff)
Remove `blaze` from the conflict error message
Closes #3508. PiperOrigin-RevId: 164722086
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java b/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
index 7287c55046..243c73c499 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
@@ -22,12 +22,13 @@ import com.google.devtools.build.lib.vfs.PathFragment;
* lead to an error if both actions were executed in the same build.
*/
public class ArtifactPrefixConflictException extends Exception {
- public ArtifactPrefixConflictException(PathFragment firstPath, PathFragment secondPath,
- Label firstOwner, Label secondOwner) {
- super(String.format(
- "output path '%s' (belonging to %s) is a prefix of output path '%s' (belonging to %s). "
- + "These actions cannot be simultaneously present; please rename one of the output files "
- + "or, as a last resort, run 'blaze clean' and then build just one of them",
- firstPath, firstOwner, secondPath, secondOwner));
+ public ArtifactPrefixConflictException(
+ PathFragment firstPath, PathFragment secondPath, Label firstOwner, Label secondOwner) {
+ super(
+ String.format(
+ "output path '%s' (belonging to %s) is a prefix of output path '%s' (belonging to %s). "
+ + "These actions cannot be simultaneously present; please rename one of the output "
+ + "files or, as a last resort, run 'clean' and then build just one of them",
+ firstPath, firstOwner, secondPath, secondOwner));
}
}