You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2006/05/13 09:58:56 UTC

svn commit: r406041 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java

Author: evenisse
Date: Sat May 13 00:58:55 2006
New Revision: 406041

URL: http://svn.apache.org/viewcvs?rev=406041&view=rev
Log:
[SCM-191] Fix compression level property loading

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java?rev=406041&r1=406040&r2=406041&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java Sat May 13 00:58:55 2006
@@ -80,13 +80,13 @@
 
         cl.setWorkingDirectory( fileSet.getBasedir().getAbsolutePath() );
 
-        if ( settings.getCompressionLevel() > 0 )
+        if ( Boolean.getBoolean( "maven.scm.cvs.use_compression" ) )
         {
-            cl.createArgument().setValue( "-z" + settings.getCompressionLevel() );
+            cl.createArgument().setValue( "-z" + System.getProperty( "maven.scm.cvs.compression_level", "3" ) );
         }
-        else if ( !System.getProperty( "maven.scm.cvs.use_compression", "true" ).equals( "false" ) )
+        else if ( settings.getCompressionLevel() > 0 )
         {
-            cl.createArgument().setValue( "-z3" );
+            cl.createArgument().setValue( "-z" + settings.getCompressionLevel() );
         }
 
         if ( !settings.isUseCvsrc() )