提交 c0952360 编写于 作者: K kohsuke

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
上级 60bccc26
......@@ -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 {
......
......@@ -24,6 +24,8 @@ 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.UnableToInstallUntilLicenseAccepted=Unable to auto-install JDK until the license is accepted.
ZipExtractionInstaller.DescriptorImpl.displayName=Extract *.zip/*.tar.gz
ZipExtractionInstaller.bad_connection=Server rejected connection.
ZipExtractionInstaller.malformed_url=Malformed URL.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册