Skip to content

Commit

Permalink
[JENKINS-13062] use 'p4' as default p4exe if no installation is confi…
Browse files Browse the repository at this point in the history
…gured
  • Loading branch information
Rob Petti committed Mar 13, 2012
1 parent 866e0f9 commit 18f5e74
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/perforce/PerforceSCM.java
Expand Up @@ -456,15 +456,15 @@ else if (pta.getTag() != null) {
public String getP4Executable(String tool) {
PerforceToolInstallation toolInstallation = getP4Tool(tool);
if(toolInstallation == null)
return "";
return "p4";
return toolInstallation.getP4Exe();
}

public String getP4Executable(String tool, Node node, TaskListener listener) {
PerforceToolInstallation toolInstallation = getP4Tool(tool);
if(toolInstallation == null)
return "";
String p4Exe="";
return "p4";
String p4Exe="p4";
try {
p4Exe = toolInstallation.forNode(node, listener).getP4Exe();
}catch(IOException e){
Expand Down

0 comments on commit 18f5e74

Please sign in to comment.