Author: bodewig
Date: Sat Oct 24 06:25:03 2009
New Revision: 829311
URL: http://svn.apache.org/viewvc?rev=829311&view=rev
Log:
Only store the command's output with no decoration in sshexec's outputproperty
if the command attribute is used. PR 48040
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/OptionalTasks/sshexec.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=829311&r1=829310&r2=829311&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sat Oct 24 06:25:03 2009
@@ -512,6 +512,11 @@
resources but not filesets.
Bugzilla Report 48035.
+ * <sshexec>'s outputproperty was prefixed by the executed command
+ when the command attribute has been used, breaking backwards
+ compatibility to Ant 1.7.0.
+ Bugzilla Report 48040.
+
Other changes:
--------------
Modified: ant/core/trunk/docs/manual/OptionalTasks/sshexec.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/OptionalTasks/sshexec.html?rev=829311&r1=829310&r2=829311&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/sshexec.html (original)
+++ ant/core/trunk/docs/manual/OptionalTasks/sshexec.html Sat Oct 24 06:25:03
2009
@@ -128,7 +128,9 @@
<tr>
<td valign="top">outputproperty</td>
<td valign="top">The name of a property in which the output of the
- command should be stored.</td>
+ command should be stored. If you use the commandResource
+ attribute, each command's output will be prefixed by the
+ command itself.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
@@ -144,7 +146,7 @@
<td valign="top">A file from which the executed command's standard
input is taken. This attribute is mutually exclusive with the
inputstring attribute.<br/>
- When executing more than one command via commandRessource, input
+ When executing more than one command via commandResource, input
will be read for each command.
<em>since Ant 1.8.0</em></td>
<td align="center" valign="top">No</td>
@@ -154,7 +156,7 @@
<td valign="top">A string which serves as the input stream for the
executed command. This attribute is mutually exclusive with the
input attribute.<br/>
- When executing more than one command via commandRessource, input
+ When executing more than one command via commandResource, input
will be read for each command.
<em>since Ant 1.8.0</em></td>
<td align="center" valign="top">No</td>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java?rev=829311&r1=829310&r2=829311&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Sat Oct 24 06:25:03 2009
@@ -191,7 +191,6 @@
/* called once */
if (command != null) {
log("cmd : " + command, Project.MSG_INFO);
- output.append(command).append(" : ");
executeCommand(session, command, output);
} else { // read command resource and execute for each command
try {
