Remove debugging; don't check for existing path

jenkinsci · Mar 24, 2011 · 31fc285 · 31fc285 · alanharder · Aug 6, 2011
1 parent 9a52962
commit 31fc285
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/main/java/hudson/plugins/rake/Rake.java b/src/main/java/hudson/plugins/rake/Rake.java
@@ -120,15 +120,12 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
         try {
             EnvVars env = build.getEnvironment(listener);
             if (rake != null) {
-                System.out.println("Rake GEM HOME: "+ rake.getGemHome());
                 if (rake.getGemHome() != null) {
                     env.put("GEM_HOME", rake.getGemHome());
                 }
-                System.out.println("Rake GEM PATH: "+ rake.getGemPath());
                 if (rake.getGemPath() != null) {
                     env.put("GEM_PATH", rake.getGemPath());
                 }
-                System.err.println("Rake Bin PATH: "+ rake.getBinPath());
                 if (rake.getBinPath() != null) {
                     StringBuilder builder = new StringBuilder();
                     String path = env.get("PATH");

diff --git a/src/main/java/hudson/plugins/rake/RvmUtil.java b/src/main/java/hudson/plugins/rake/RvmUtil.java
@@ -79,14 +79,7 @@ public static RubyInstallation[] getRvmRubies(Rvm rvm) {
                         // Add GEM bin directory to path
                         newpath = newpath.concat(File.pathSeparator).concat(new File(ruby.getGemHome(), "bin").getCanonicalPath());
 
-                        // Create or append the calculated path for this Ruby install
-                        path = ruby.getBinPath();
-                        if (path == null || path.length() == 0) {
-                            path = newpath;
-                        } else {
-                            path = path.concat(File.pathSeparator).concat(newpath);
-                        }
-                        ruby.setBinPath(path);
+                        ruby.setBinPath(newpath);
 
                         rubies.add(ruby);
                     }