report the exit code.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33148 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/tools/JDKInstaller.java

@@ -210,9 +210,10 @@ public class JDKInstaller extends ToolInstaller {
             // Oh Windows, oh windows, why do you have to be so difficult?
             args.add("/v/qn REBOOT=Suppress INSTALLDIR=\\\""+ expectedLocation +"\\\" /L \\\""+logFile+"\\\"");
 
-            if (launcher.launch().cmds(args).stdout(out)
-                  .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join() != 0) {
-                out.println(Messages.JDKInstaller_FailedToInstallJDK());
+            int r = launcher.launch().cmds(args).stdout(out)
+                    .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join();
+            if (r != 0) {
+                out.println(Messages.JDKInstaller_FailedToInstallJDK(r));
                 // log file is in UTF-16
                 InputStreamReader in = new InputStreamReader(fs.read(logFile), "UTF-16");
                 try {

core/src/main/resources/hudson/tools/Messages.properties

@@ -24,7 +24,7 @@ ToolLocationNodeProperty.displayName=Tool Locations
 CommandInstaller.DescriptorImpl.displayName=Run Command
 CommandInstaller.no_command=Must provide a command to run.
 CommandInstaller.no_toolHome=Must provide a tool home directory.
-JDKInstaller.FailedToInstallJDK=Failed to install JDK
+JDKInstaller.FailedToInstallJDK=Failed to install JDK. Exit code={0}
 JDKInstaller.UnableToInstallUntilLicenseAccepted=Unable to auto-install JDK until the license is accepted.
 ZipExtractionInstaller.DescriptorImpl.displayName=Extract *.zip/*.tar.gz
 ZipExtractionInstaller.bad_connection=Server rejected connection.