diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index c394fdf1c7..4db3388813 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -226,7 +226,7 @@ public abstract class AbstractBuild

,R extends Abs JDK jdk = project.getJDK(); if(jdk !=null) jdk.buildEnvVars(env); - project.getScm().buildEnvVars(env); + project.getScm().buildEnvVars(this,env); return env; } diff --git a/core/src/main/java/hudson/scm/AbstractCVSFamilySCM.java b/core/src/main/java/hudson/scm/AbstractCVSFamilySCM.java index 5fc68f6dcf..cc9734d0ce 100644 --- a/core/src/main/java/hudson/scm/AbstractCVSFamilySCM.java +++ b/core/src/main/java/hudson/scm/AbstractCVSFamilySCM.java @@ -4,12 +4,9 @@ import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; import hudson.Proc; -import hudson.model.BuildListener; import hudson.model.TaskListener; import hudson.util.ArgumentListBuilder; -import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.io.OutputStream; import java.util.HashMap; @@ -56,7 +53,7 @@ abstract class AbstractCVSFamilySCM extends SCM { Map env = new HashMap(); if(!overrideOnly) env.putAll(EnvVars.masterEnvVars); - buildEnvVars(env); + buildEnvVars(null/*TODO*/,env); return env; } } diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java index 1aee7253e0..c893eb52b5 100644 --- a/core/src/main/java/hudson/scm/CVSSCM.java +++ b/core/src/main/java/hudson/scm/CVSSCM.java @@ -725,7 +725,7 @@ public class CVSSCM extends AbstractCVSFamilySCM implements Serializable { return DescriptorImpl.DESCRIPTOR; } - public void buildEnvVars(Map env) { + public void buildEnvVars(AbstractBuild build, Map env) { if(cvsRsh!=null) env.put("CVS_RSH",cvsRsh); String cvspass = getDescriptor().getCvspassFile(); diff --git a/core/src/main/java/hudson/scm/SCM.java b/core/src/main/java/hudson/scm/SCM.java index 67db319cd0..c4c73b68ff 100644 --- a/core/src/main/java/hudson/scm/SCM.java +++ b/core/src/main/java/hudson/scm/SCM.java @@ -139,7 +139,7 @@ public abstract class SCM implements Describable, ExtensionPoint { * This can be used to propagate information from SCM to builds * (for example, SVN revision number.) */ - public void buildEnvVars(Map env) { + public void buildEnvVars(AbstractBuild build, Map env) { // default implementation is noop. } diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java index 90f34d5618..926cc0559b 100644 --- a/core/src/main/java/hudson/scm/SubversionSCM.java +++ b/core/src/main/java/hudson/scm/SubversionSCM.java @@ -163,10 +163,17 @@ public class SubversionSCM extends SCM implements Serializable { return username; } + @Override public SubversionRepositoryBrowser getBrowser() { return browser; } + @Override + public void buildEnvVars(AbstractBuild build, Map env) { + super.buildEnvVars(build, env); + + } + /** * Called after checkout/update has finished to compute the changelog. */