commit 14ab5677cdb32debd2992411a396798b678d445c
author Lukacs Berki <lberki@google.com> Thu Mar 31 07:52:15 2016 +0000
committer Lukacs Berki <lberki@google.com> Thu Mar 31 11:44:42 2016 +0000
tree 760c9df86f7d7132649e6d385ac45715011b5566
parent 84779580c5d2338b4273773b0fc311e35c149ccc

Do not special-case the //external package so in so that target pattern parsing for it is not broken.

--
MOS_MIGRATED_REVID=118654985

src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java

diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
index c405efa..156fdcb 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
@@ -343,6 +343,7 @@
         PackageIdentifier packageIdentifier, String suffix, boolean wasOriginallyAbsolute,
         boolean rulesOnly, boolean checkWildcardConflict) {
       super(Type.TARGETS_IN_PACKAGE, originalPattern, offset);
+      Preconditions.checkArgument(!packageIdentifier.getRepository().isDefault());
       this.packageIdentifier = packageIdentifier;
       this.suffix = Preconditions.checkNotNull(suffix);
       this.wasOriginallyAbsolute = wasOriginallyAbsolute;
@@ -456,6 +457,7 @@
     private TargetsBelowDirectory(
         String originalPattern, String offset, PackageIdentifier directory, boolean rulesOnly) {
       super(Type.TARGETS_BELOW_DIRECTORY, originalPattern, offset);
+      Preconditions.checkArgument(!directory.getRepository().isDefault());
       this.directory = Preconditions.checkNotNull(directory);
       this.rulesOnly = rulesOnly;
     }
@@ -639,11 +641,7 @@
       }
 
       if (repository == null) {
-        if (packagePart.startsWith(Label.EXTERNAL_PACKAGE_NAME.toString())) {
-          repository = PackageIdentifier.DEFAULT_REPOSITORY_NAME;
-        } else {
-          repository = PackageIdentifier.MAIN_REPOSITORY_NAME;
-        }
+        repository = PackageIdentifier.MAIN_REPOSITORY_NAME;
       }
 
       if (packagePart.endsWith("/...")) {