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/02/07 15:09:01 UTC

svn commit: r375602 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java

Author: evenisse
Date: Tue Feb  7 06:09:00 2006
New Revision: 375602

URL: http://svn.apache.org/viewcvs?rev=375602&view=rev
Log:
Don't use .cvspass if cvs is CVSNT

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

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java?rev=375602&r1=375601&r2=375602&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java Tue Feb  7 06:09:00 2006
@@ -22,6 +22,7 @@
 import org.apache.maven.scm.login.AbstractLoginCommand;
 import org.apache.maven.scm.login.LoginScmResult;
 import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.cvslib.command.CvsCommandUtils;
 import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
 
 import java.io.IOException;
@@ -34,7 +35,7 @@
     extends AbstractLoginCommand
 {
     /**
-     * @see org.apache.maven.scm.login.AbstractLoginCommand#executeLoginCommand(org.apache.maven.scm.provider.ScmProviderRepository, org.apache.maven.scm.CommandParameters)
+     * @see org.apache.maven.scm.login.AbstractLoginCommand#executeLoginCommand(org.apache.maven.scm.provider.ScmProviderRepository, org.apache.maven.scm.ScmFileSet, org.apache.maven.scm.CommandParameters)
      */
     public LoginScmResult executeLoginCommand( ScmProviderRepository repository, ScmFileSet fileSet,
                                                CommandParameters parameters )
@@ -45,6 +46,11 @@
         if ( !"pserver".equals( repo.getTransport() ) )
         {
             return new LoginScmResult( null, "The cvs login ignored for " + repo.getTransport() + ".", "", true );
+        }
+        else if ( CvsCommandUtils.isCvsNT() )
+        {
+            //We don't continue becauseCVSNT doesn't use .cvspass
+            return new LoginScmResult( null, "The cvs login ignored for CVSNT.", "", true );
         }
 
         CvsPass passGenerator = new CvsPass( getLogger() );