Merge pull request #75 from sylvainmouquet/master

[JENKINS-34446] Fix bug - TFS PLUGIN environnement variables in project path
jenkinsci · Aug 3, 2016 · ebf637e · ebf637e
2 parents 2ddb56b + b29e72f
commit ebf637e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/tfs/TFSLabeler.java b/src/main/java/hudson/plugins/tfs/TFSLabeler.java
@@ -78,10 +78,11 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
             Computer computer = Computer.currentComputer();
             String normalizedLabelName = computeDynamicValue(build, getLabelName());
             String tfsWorkspace = tfsScm.getWorkspaceName(build, computer);
-
+            String tfsProjectPath = computeDynamicValue(build, tfsScm.getProjectPath());
+
             try {
-                logger.info(String.format("Create label '%s' on workspace '%s'", normalizedLabelName, tfsWorkspace));
-                LabelCommand labelCommand = new LabelCommand(server, normalizedLabelName, tfsWorkspace, tfsScm.getProjectPath());
+                logger.info(String.format("Create label '%s' on workspace '%s' with project path '%s' ", normalizedLabelName, tfsWorkspace, tfsProjectPath));
+                LabelCommand labelCommand = new LabelCommand(server, normalizedLabelName, tfsWorkspace, tfsProjectPath);
                 server.execute(labelCommand.getCallable());
             } finally {
                 server.close();