Browse Source

Fix bug in P4 tasks when port, user or client have not been specified.

Submitted by:	Byrne Reese <breese@grandcentral.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268780 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
b0edc6575b
1 changed files with 9 additions and 3 deletions
  1. +9
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java

+ 9
- 3
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java View File

@@ -136,9 +136,15 @@ public abstract class P4Base extends org.apache.tools.ant.Task {
commandline.setExecutable("p4");

//Check API for these - it's how CVS does it...
commandline.createArgument().setValue(P4Port);
commandline.createArgument().setValue(P4User);
commandline.createArgument().setValue(P4Client);
if (P4Port != null && P4Port.length() != 0) {
commandline.createArgument().setValue(P4Port);
}
if (P4User != null && P4User.length() != 0) {
commandline.createArgument().setValue(P4User);
}
if (P4Client != null && P4Client.length() != 0) {
commandline.createArgument().setValue(P4Client);
}
commandline.createArgument().setLine(command);

log("Execing "+commandline.getCommandline(), Project.MSG_VERBOSE);


Loading…
Cancel
Save