diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2017-07-21 12:57:18 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-24 09:50:59 +0200 |
| commit | 1920dd98491fdb00daf6187beed58c8ff06d4fd6 (patch) | |
| tree | e6b99eb8ebd937e709d6a3a071e1e8606362b478 /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | |
| parent | 902d81a73730da70229bdb6db612d07ca6433b21 (diff) | |
Make error message in case top-level aspect is missing clearer.
Fixes #2874.
Change-Id: I636e0f6b56a1e33adfc64e90f36f76d4254d0281
PiperOrigin-RevId: 162726099
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java index b01faa95e4..234ed0bc9d 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java @@ -120,9 +120,15 @@ public final class AspectFunction implements SkyFunction { Object skylarkValue = skylarkImportLookupValue.getEnvironmentExtension().getBindings() .get(skylarkValueName); + if (skylarkValue == null) { + throw new ConversionException( + String.format( + "%s is not exported from %s", skylarkValueName, extensionLabel.toString())); + } if (!(skylarkValue instanceof SkylarkAspect)) { throw new ConversionException( - skylarkValueName + " from " + extensionLabel.toString() + " is not an aspect"); + String.format( + "%s from %s is not an aspect", skylarkValueName, extensionLabel.toString())); } return (SkylarkAspect) skylarkValue; } catch (SkylarkImportFailedException | ConversionException e) { |