summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2013-08-29 12:33:37 -0700
committerSom Snytt <som.snytt@gmail.com>2013-08-29 13:00:06 -0700
commit8b10daf2cb4367cd2565bd67efd2b6ead94ca18e (patch)
tree3e19fd5cb2786eb7d52bab48a44b6a281bac9525
parent7a0d983aedd8ad8f3f41a22ffa0ce4b6ab2f1523 (diff)
downloadscala-8b10daf2cb4367cd2565bd67efd2b6ead94ca18e.tar.gz
scala-8b10daf2cb4367cd2565bd67efd2b6ead94ca18e.tar.bz2
scala-8b10daf2cb4367cd2565bd67efd2b6ead94ca18e.zip
[nomaster] SI-7652 Bad tools fails loudly
A brief message is all that's required to alleviate the look of consternation on the face of your user.
-rw-r--r--src/compiler/scala/tools/util/Javap.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/util/Javap.scala b/src/compiler/scala/tools/util/Javap.scala
index c3264d0787..21137aca56 100644
--- a/src/compiler/scala/tools/util/Javap.scala
+++ b/src/compiler/scala/tools/util/Javap.scala
@@ -50,7 +50,7 @@ class JavapClass(
tryFile(path) getOrElse tryClass(path)
def apply(args: Seq[String]): List[JpResult] = {
- if (failed) Nil
+ if (failed) List(new JpError("Could not load javap tool. Check that JAVA_HOME is correct."))
else args.toList filterNot (_ startsWith "-") map { path =>
val bytes = findBytes(path)
if (bytes.isEmpty) new JpError("Could not find class bytes for '%s'".format(path))