From e3d7cfb9c8176d78d850fe11ab5ecbce05367eab Mon Sep 17 00:00:00 2001 From: Jack Leow Date: Fri, 8 Jul 2011 17:12:32 -0700 Subject: [PATCH] Minor refactoring. --- .../java/org/jvnet/hudson/plugins/JythonComputerListener.java | 2 +- .../src/main/java/org/jvnet/hudson/plugins/JythonPlugin.java | 2 +- .../src/main/java/org/jvnet/hudson/plugins/PythonPackage.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonComputerListener.java b/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonComputerListener.java index d666968..06d14d8 100644 --- a/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonComputerListener.java +++ b/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonComputerListener.java @@ -29,7 +29,7 @@ public void preOnline( JythonPlugin.syncSitePackages(jythonHome, listener); jythonHome.child("jython").chmod(0755); jythonHome.child("tmp").mkdirs(); - listener.getLogger().println("Installed Jython runtime."); + listener.getLogger().println("Installed Jython runtime"); } } } \ No newline at end of file diff --git a/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonPlugin.java b/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonPlugin.java index 14f9851..00963f0 100644 --- a/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonPlugin.java +++ b/jython-plugin/src/main/java/org/jvnet/hudson/plugins/JythonPlugin.java @@ -78,7 +78,7 @@ public void start() throws Exception { JYTHON_HOME.unzipFrom(INSTALLER_URL.openStream()); JYTHON_HOME.child("jython").chmod(0755); JYTHON_HOME.child("tmp").mkdirs(); - LOG.info("Installed Jython runtime."); + LOG.info("Installed Jython runtime"); } } } \ No newline at end of file diff --git a/jython-plugin/src/main/java/org/jvnet/hudson/plugins/PythonPackage.java b/jython-plugin/src/main/java/org/jvnet/hudson/plugins/PythonPackage.java index 3822167..87adffb 100644 --- a/jython-plugin/src/main/java/org/jvnet/hudson/plugins/PythonPackage.java +++ b/jython-plugin/src/main/java/org/jvnet/hudson/plugins/PythonPackage.java @@ -59,6 +59,7 @@ private void invokeJython(String scriptPath, List options) { ProcessBuilder procBuilder = new ProcessBuilder(procCmd). redirectErrorStream(true); + // Set "http_proxy" environment variable to Jenkins proxy value ProxyConfiguration proxy = Hudson.getInstance().proxy; if (proxy != null) { procBuilder.environment().put( @@ -69,7 +70,6 @@ private void invokeJython(String scriptPath, List options) { new InputStreamReader(proc.getInputStream())); StringBuilder lines = new StringBuilder(); String line = stdOut.readLine(); - boolean nameSet = false; while (line != null) { System.out.println(line); lines.append(line);