Return-Path: 
 <wagon-commits-return-684-apmail-maven-wagon-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-wagon-commits-archive@www.apache.org
Received: (qmail 4393 invoked from network); 22 Feb 2006 17:12:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Feb 2006 17:12:03 -0000
Received: (qmail 79523 invoked by uid 500); 22 Feb 2006 17:12:02 -0000
Delivered-To: apmail-maven-wagon-commits-archive@maven.apache.org
Received: (qmail 79431 invoked by uid 500); 22 Feb 2006 17:12:01 -0000
Mailing-List: contact wagon-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:wagon-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:wagon-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:wagon-commits@maven.apache.org>
List-Id: <wagon-commits.maven.apache.org>
Delivered-To: mailing list wagon-commits@maven.apache.org
Received: (qmail 79403 invoked by uid 99); 22 Feb 2006 17:12:00 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2006 09:12:00 -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; Wed, 22 Feb 2006 09:11:59 -0800
Received: (qmail 4001 invoked by uid 65534); 22 Feb 2006 17:11:39 -0000
Message-ID: <20060222171139.3998.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r379818 - in
 /maven/wagon/trunk/wagon-providers/wagon-ssh:
 pom.xml
 src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
Date: Wed, 22 Feb 2006 17:11:38 -0000
To: wagon-commits@maven.apache.org
From: jdcasey@apache.org
X-Mailer: svnmailer-1.0.6
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdcasey
Date: Wed Feb 22 09:11:36 2006
New Revision: 379818

URL: http://svn.apache.org/viewcvs?rev=379818&view=rev
Log:
[WAGONSSH-36] Part 1: adding recommended fix to the unzip command. Will address not reading from the output stream in -alpha-8, since it's a higher risk fix.

Modified:
    maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?rev=379818&r1=379817&r2=379818&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Wed Feb 22 09:11:36 2006
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>wagon-providers</artifactId>
     <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-alpha-7-SNAPSHOT</version>
+    <version>1.0-alpha-6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>wagon-ssh</artifactId>
@@ -39,4 +39,4 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java?rev=379818&r1=379817&r2=379818&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java Wed Feb 22 09:11:36 2006
@@ -307,6 +307,17 @@
                     output.add( line );
                 }
             }
+            
+            // drain the output stream.
+            // we'll save this for the 1.0-alpha-8 line, so we can test it more. the -q arg in the
+            // unzip command should keep us until then...
+//            int avail = in.available();
+//            byte[] trashcan = new byte[1024];
+//            
+//            while( ( avail = in.available() ) > 0 )
+//            {
+//                in.read( trashcan, 0, avail );
+//            }
 
             if ( output != null && !output.isEmpty() )
             {
@@ -544,7 +555,7 @@
 
         try
         {
-            executeCommand( "cd " + path + "; unzip -o " + zipFile.getName() + "; rm -f " + zipFile.getName() );
+            executeCommand( "cd " + path + "; unzip -q -o " + zipFile.getName() + "; rm -f " + zipFile.getName() );
 
             zipFile.delete();
 



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