From 8e2ae53375c0a615c53ab4e10f27856025a83fb1 Mon Sep 17 00:00:00 2001 From: nharmata Date: Thu, 18 Jan 2018 09:18:10 -0800 Subject: Include the list of 'excludes' glob patterns in the error message used when an IOException is encountered from a Globber. The io error may have been encountered during evaluation of one of the 'excludes' patterns. RELNOTES: None PiperOrigin-RevId: 182390180 --- .../com/google/devtools/build/lib/packages/PackageFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java index 79f6a9d0c7..daf3dfe247 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java @@ -582,8 +582,11 @@ public final class PackageFactory { Globber.Token globToken = context.globber.runAsync(includes, excludes, excludeDirs); matches = context.globber.fetch(globToken); } catch (IOException e) { - String errorMessage = - "error globbing [" + Joiner.on(", ").join(includes) + "]: " + e.getMessage(); + String errorMessage = String.format( + "error globbing [%s]%s: %s", + Joiner.on(", ").join(includes), + excludes.isEmpty() ? "" : " - [" + Joiner.on(", ").join(excludes) + "]", + e.getMessage()); context.eventHandler.handle(Event.error(ast.getLocation(), errorMessage)); context.pkgBuilder.setIOExceptionAndMessage(e, errorMessage); matches = ImmutableList.of(); -- cgit v1.2.3