bodewig 2004/09/30 02:26:23
Modified: . Tag: ANT_16_BRANCH CONTRIBUTORS
src/main/org/apache/tools/ant/taskdefs/optional/ssh Tag:
ANT_16_BRANCH Scp.java
Log:
Merge fix for 30669
Revision Changes Path
No revision
No revision
1.1.2.24 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- CONTRIBUTORS 21 Sep 2004 11:38:27 -0000 1.1.2.23
+++ CONTRIBUTORS 30 Sep 2004 09:26:23 -0000 1.1.2.24
@@ -13,6 +13,7 @@
Aslak Hellesøy
Avik Sengupta
Balazs Fejes 2
+Ben Galbraith
Benoit Moussaud
Brad Clark
Brian Deitte
No revision
No revision
1.9.2.8 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Index: Scp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -u -r1.9.2.7 -r1.9.2.8
--- Scp.java 14 Jun 2004 12:24:17 -0000 1.9.2.7
+++ Scp.java 30 Sep 2004 09:26:23 -0000 1.9.2.8
@@ -176,7 +176,7 @@
upload(fromUri, toUri);
}
} else if (isFromRemote && isToRemote) {
- // not implemented yet.
+ throw new BuildException("Copying from a remote server to a
remote server is not supported.");
} else {
throw new BuildException("'todir' and 'file' attributes "
+ "must have syntax like the following: "
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
