From 3c566c6697a3a0e574f0cc7da2da9fb16be35cb7 Mon Sep 17 00:00:00 2001 From: mschaller Date: Thu, 22 Jun 2017 00:11:44 +0200 Subject: Use targets' labels' package identifier for query output=package Subinclude targets' packages are the package containing the load statement. Subinclude targets' labels are the bzl files they refer to. The latter has the appropriate package to display for --output=package. Fixes #3122. PiperOrigin-RevId: 159750840 --- .../com/google/devtools/build/lib/query2/output/OutputFormatter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com') 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 3fb451adff..48923a3e83 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 partialResult) { for (Target target : partialResult) { - packageNames.add(target.getLabel().getPackageName()); + packageNames.add(target.getLabel().getPackageIdentifier().toString()); } } -- cgit v1.2.3