Return-Path: Delivered-To: apmail-maven-wagon-commits-archive@www.apache.org Received: (qmail 59518 invoked from network); 4 Jan 2006 07:37:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Jan 2006 07:37:39 -0000 Received: (qmail 81748 invoked by uid 500); 4 Jan 2006 07:37:39 -0000 Delivered-To: apmail-maven-wagon-commits-archive@maven.apache.org Received: (qmail 81729 invoked by uid 500); 4 Jan 2006 07:37:38 -0000 Mailing-List: contact wagon-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list wagon-commits@maven.apache.org Received: (qmail 81718 invoked by uid 99); 4 Jan 2006 07:37:38 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2006 23:37:38 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 03 Jan 2006 23:37:38 -0800 Received: (qmail 59461 invoked by uid 65534); 4 Jan 2006 07:37:28 -0000 Message-ID: <20060104073728.59460.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: wagon-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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