Fix "put the colon here" message for non-default repositories.

--
Change-Id: I86b90ff6eda6a16c2efeb8fffca301e2594c254e
Reviewed-on: https://bazel-review.googlesource.com/#/c/2784/
MOS_MIGRATED_REVID=113529297

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index 4d8596f27a..d77ef7907a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -795,8 +795,11 @@ public class PackageFunction implements SkyFunction {
           containingPkg.getPackageFragment().segmentCount()
               - label.getPackageFragment().segmentCount(),
           labelNameFragment.segmentCount());
-      message += " (perhaps you meant to put the colon here: "
-          + "'//" + containingPkg + ":" + labelNameInContainingPackage + "'?)";
+      message += " (perhaps you meant to put the colon here: '";
+      if (containingPkg.getRepository().isDefault()) {
+        message += "//";
+      }
+      message += containingPkg + ":" + labelNameInContainingPackage + "'?)";
     } else {
       message += " (have you deleted " + containingPkg + "/BUILD? "
           + "If so, use the --deleted_packages=" + containingPkg + " option)";