maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
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 GMT
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


Mime
View raw message