i18n and clarified what it was trying to install, since that's not obvious.

See http://www.nabble.com/Don%27t-understand-build-messages...-td25177740.html

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21144 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2009-08-28 01:16:20 +00:00
1 parent 60bccc26eb
commit c09523609e
2 files changed
+5 -3

No files matched your search

@@ -101,7 +101,7 @@ public class JDKInstaller extends ToolInstaller {
PrintStream out = log.getLogger();
try {
if(!acceptLicense) {
out.println("Unable to perform installation until the license is accepted.");
out.println(Messages.JDKInstaller_UnableToInstallUntilLicenseAccepted());
return expectedLocation;
}
// already installed?
@@ -124,7 +124,7 @@ public class JDKInstaller extends ToolInstaller {
file.chmod(0755);
if(node.createLauncher(log).launch().cmds(file.getRemote(),"-noregister")
.stdin(new ByteArrayInputStream("yes".getBytes())).stdout(out).pwd(expectedLocation).join()!=0)
throw new AbortException("Failed to install JDK");
throw new AbortException(Messages.JDKInstaller_FailedToInstallJDK());
// JDK creates its own sub-directory, so pull them up
List<FilePath> paths = expectedLocation.list(new JdkFinder());
@@ -170,7 +170,7 @@ public class JDKInstaller extends ToolInstaller {
args.add("/v/qn REBOOT=Suppress INSTALLDIR=\\\""+normalizedPath+"\\\" /L \\\""+logFile.getRemote()+"\\\"");
if(node.createLauncher(log).launch().cmds(args).stdout(out).pwd(expectedLocation).join()!=0) {
out.println("Failed to install JDK");
out.println(Messages.JDKInstaller_FailedToInstallJDK());
// log file is in UTF-16
InputStreamReader in = new InputStreamReader(logFile.read(), "UTF-16");
try {