- check for errors when using the compilation d...

- check for errors when using the compilation daemon run scripts in
- package "$scalascript" instead of "scalascript"

1 files changed, 5 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala
index a9051c5767..552c4b3644 100644
--- a/src/compiler/scala/tools/nsc/CompileClient.scala
+++ b/src/compiler/scala/tools/nsc/CompileClient.scala
@@ -95,13 +95,18 @@ object CompileClient {
     val in = new BufferedReader(new InputStreamReader(socket.getInputStream()))
     out.println(CompileSocket.getPassword(socket.getPort()))
     out.println(args.mkString("", "\0", ""))
+    var sawerror = false
     var fromServer = in.readLine()
     while (fromServer != null) {
+      if(CompileSocket.errorPattern.matcher(fromServer).matches)
+        sawerror = true
       System.out.println(fromServer)
       fromServer = in.readLine()
     }
     in.close()
     out.close()
     socket.close()
+
+    System.exit(if (sawerror) 1 else 0)
   }
 }