diff options
author | Lukacs Berki <lberki@google.com> | 2015-06-10 08:24:43 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2015-06-10 16:03:01 +0000 |
commit | bcb81ab35c02124e72acd03fcf0638144a9eb242 (patch) | |
tree | efcff2eec8a31a1a482090d587ed9284eb67da1c /src/main/java/com/google/devtools/build/lib/runtime/commands | |
parent | de7cd0b3663a62da20607369a3cfad82cc7c627f (diff) |
Description redacted.
--
MOS_MIGRATED_REVID=95615442
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/commands')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java index 5b655feb83..72ec9ad8f7 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.query2.engine.QueryEnvironment.Setting; import com.google.devtools.build.lib.query2.engine.QueryEvalResult; import com.google.devtools.build.lib.query2.engine.QueryException; import com.google.devtools.build.lib.query2.engine.QueryExpression; -import com.google.devtools.build.lib.query2.output.AspectResolver; import com.google.devtools.build.lib.query2.output.OutputFormatter; import com.google.devtools.build.lib.query2.output.QueryOptions; import com.google.devtools.build.lib.query2.output.QueryOutputUtils; @@ -136,9 +135,9 @@ public final class QueryCommand implements BlazeCommand { // 3. Output results: PrintStream output = new PrintStream(runtime.getReporter().getOutErr().getOutputStream()); try { - QueryOutputUtils.output(queryOptions, result, formatter, output, queryOptions.withAspectDeps - ? new AspectResolver(runtime.getPackageManager(), runtime.getReporter()) - : null); + QueryOutputUtils.output(queryOptions, result, formatter, output, + queryOptions.aspectDeps.createResolver( + runtime.getPackageManager(), runtime.getReporter())); } catch (ClosedByInterruptException | InterruptedException e) { runtime.getReporter().handle(Event.error("query interrupted")); return ExitCode.INTERRUPTED; |