maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r365852 - /maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
Date Wed, 04 Jan 2006 07:37:27 GMT
Author: brett
Date: Tue Jan  3 23:37:24 2006
New Revision: 365852

URL: http://svn.apache.org/viewcvs?rev=365852&view=rev
Log:
correctly parse plink errors as well as normal shell errors from ssh
PR: WAGONSSH-32

Modified:
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java?rev=365852&r1=365851&r2=365852&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/sshext/ScpExternalWagon.java
Tue Jan  3 23:37:24 2006
@@ -211,7 +211,7 @@
 
         cl.createArgument().setValue( command );
 
-	fireSessionDebug( "Executing command: " + cl.toString() );
+        fireSessionDebug( "Executing command: " + cl.toString() );
 
         try
         {
@@ -264,8 +264,8 @@
         {
             cl.createArgument().setLine( scpArgs );
         }
-        String qualifiedRemoteFile = authenticationInfo.getUserName() + "@" + getRepository().getHost()
+ ":" +
-            remoteFile;
+        String qualifiedRemoteFile =
+            authenticationInfo.getUserName() + "@" + getRepository().getHost() + ":" + remoteFile;
         if ( put )
         {
             cl.createArgument().setValue( localFile.getName() );
@@ -277,7 +277,7 @@
             cl.createArgument().setValue( localFile.getName() );
         }
 
-	fireSessionDebug( "Executing command: " + cl.toString() );
+        fireSessionDebug( "Executing command: " + cl.toString() );
 
         try
         {
@@ -285,7 +285,7 @@
             int exitCode = CommandLineUtils.executeCommandLine( cl, null, err );
             if ( exitCode != 0 )
             {
-                if ( !put && err.getOutput().trim().endsWith( "No such file or directory"
) )
+                if ( !put && err.getOutput().trim().toLowerCase().endsWith( "no such
file or directory" ) )
                 {
                     throw new ResourceDoesNotExistException( err.getOutput() );
                 }



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org


Mime
View raw message