From e9424cf9b9d72b98594966d5ac0f15bb018ec639 Mon Sep 17 00:00:00 2001
From: ajmichael <ajmichael@google.com>
Date: Wed, 21 Jun 2017 20:24:15 +0200
Subject: Automated rollback of commit
 7dec00574aa91327693f6ba7e90bff5bc834253e.

*** Reason for rollback ***

Tickled a hidden bug in Blaze query.

RELNOTES: None
PiperOrigin-RevId: 159718294
---
 site/docs/query.html                                          |  5 -----
 .../devtools/build/lib/query2/output/OutputFormatter.java     |  2 +-
 src/test/shell/bazel/local_repository_test.sh                 | 11 -----------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/site/docs/query.html b/site/docs/query.html
index 86b4318e18..5eb8885357 100644
--- a/site/docs/query.html
+++ b/site/docs/query.html
@@ -1224,11 +1224,6 @@ maxrank
   packages.
 </p>
 
-<p>
-  Packages in external repositories are formatted as
-  <code>@repo//foo/bar</code> while packages in the main repository are
-  formatted as <code>foo/bar</code>.
-</p>
 <p>
   In conjunction with the <code>deps(...)</code> query, this output
   option can be used to find the set of packages that must be checked
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java
index d504437c22..3fb451adff 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java
@@ -344,7 +344,7 @@ public abstract class OutputFormatter implements Serializable {
         public void processOutput(Iterable<Target> partialResult) {
 
           for (Target target : partialResult) {
-            packageNames.add(target.getPackage().getPackageIdentifier().toString());
+            packageNames.add(target.getLabel().getPackageName());
           }
         }
 
diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh
index 6e9e8538f7..bc3a08a46e 100755
--- a/src/test/shell/bazel/local_repository_test.sh
+++ b/src/test/shell/bazel/local_repository_test.sh
@@ -427,17 +427,6 @@ EOF
   expect_log "//external:my_repo"
 }
 
-function test_repository_package_query() {
-  mkdir a b b/b
-  echo "local_repository(name='b', path='b')" > WORKSPACE
-  echo "sh_library(name='a', deps=['@b//b'])" > a/BUILD
-  touch b/WORKSPACE
-  echo "sh_library(name='b')" > b/b/BUILD
-  bazel query --output package "deps(//a)" >& $TEST_log || fail "query failed"
-  expect_log "a"
-  expect_log "@b//b"
-}
-
 function test_warning() {
   local bar=$TEST_TMPDIR/bar
   rm -rf "$bar"
-- 
cgit v1.2.3