ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r417590 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Date Tue, 27 Jun 2006 21:39:47 GMT
Author: mbenson
Date: Tue Jun 27 14:39:46 2006
New Revision: 417590

URL: http://svn.apache.org/viewvc?rev=417590&view=rev
Log:
allow @s before the "real" one in scp uris.  Bugzilla 38082.
Submitted by Michael Montuori/Robert Anderson.

Modified:
    ant/core/trunk/CONTRIBUTORS
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java

Modified: ant/core/trunk/CONTRIBUTORS
URL: http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=417590&r1=417589&r2=417590&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=417590&r1=417589&r2=417590&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Jun 27 14:39:46 2006
@@ -232,6 +232,9 @@
   erroneously deleted the "destination" file before attempting to rename
   the source file.  Bugzilla 37701.
 
+* <scp> can now handle uris with @s other than the final one denoting the
+  domain.  Bugzilla 38082.
+
 Other changes:
 --------------
 * took in bugzilla report 39320.

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java?rev=417590&r1=417589&r2=417590&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java Tue Jun 27
14:39:46 2006
@@ -307,7 +307,7 @@
     }
 
     private String parseUri(String uri) {
-        int indexOfAt = uri.indexOf('@');
+        int indexOfAt = uri.lastIndexOf('@');
         int indexOfColon = uri.indexOf(':');
         if (indexOfColon > -1 && indexOfColon < indexOfAt) {
             // user:password@host:/path notation



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message