Skip to content

Fixing build parameters not being expanded in slave client name format #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rpetti merged 1 commit into from
Jul 17, 2014
Merged

Fixing build parameters not being expanded in slave client name format #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/perforce/PerforceSCM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,20 +1713,20 @@ private String getEffectiveClientName(AbstractBuild build, Map<String,String> en
Node buildNode = build.getBuiltOn();
FilePath workspace = build.getWorkspace();
String p4Client = this.p4Client;
p4Client = MacroStringHelper.substituteParameters(p4Client, build, env);
try {
p4Client = getEffectiveClientName(p4Client, buildNode);
} catch (Exception e) {
new StreamTaskListener(System.out).getLogger().println(
"Could not get effective client name: " + e.getMessage());
}
p4Client = MacroStringHelper.substituteParameters(p4Client, build, env);
return p4Client;
}

private String getDefaultEffectiveClientName(AbstractProject project, Node buildNode, FilePath workspace)
throws IOException, InterruptedException {
String basename = MacroStringHelper.substituteParametersNoCheck(this.p4Client, getDefaultSubstitutions(project));
return getEffectiveClientName(basename, buildNode);
String basename = getEffectiveClientName(this.p4Client, buildNode);
return MacroStringHelper.substituteParametersNoCheck(basename, getDefaultSubstitutions(project));
}

private String getEffectiveClientName(String basename, Node buildNode)
Expand Down