[FIXED JENKINS-11423] perform parameter substitution on clientSpec pa…

…th when using a file from perforce for the client spec.
jenkinsci · Oct 21, 2011 · 269c541 · 269c541
1 parent 8f110ae
commit 269c541
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceSCM.java b/src/main/java/hudson/plugins/perforce/PerforceSCM.java
@@ -1222,7 +1222,13 @@ else if (localPath.trim().equals(""))
         // we could copy from a master clientspec to the slaves.
 
         if (updateView || creatingNewWorkspace) {
-			if (useClientSpec) {
+            if (useClientSpec) {
+                String clientSpec;
+                if(build!=null){
+                    clientSpec = substituteParameters(this.clientSpec, build);
+                } else {
+                    clientSpec = substituteParameters(this.clientSpec, getDefaultSubstitutions(project));
+                }
                 log.println("Read ClientSpec from: " + clientSpec);
                 com.tek42.perforce.parse.File f = depot.getFile(clientSpec);
                 projectPath = f.read();