Author: mperham
Date: Thu Jun  8 07:02:34 2006
New Revision: 412755

URL: http://svn.apache.org/viewvc?rev=412755&view=rev
Log:
PR: SCM-184
Submitted by: John Didion
Use canonical path in clientspec (non-canonical breaks Continuum)

Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java?rev=412755&r1=412754&r2=412755&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
 Thu Jun  8 07:02:34 2006
@@ -324,10 +324,17 @@
     {
         String clientspecName = getClientspecName( repo, workDir );
         String userName = getUsername( repo );
-
+        String rootDir = null;
+        try {
+            rootDir = workDir.getCanonicalPath();
+        } catch (IOException ex) {
+            //getLogger().error("Error getting canonical path for working 
directory: " + workDir, ex);
+            rootDir = workDir.getAbsolutePath();
+        }
+        
         StringBuffer buf = new StringBuffer();
         buf.append( "Client: " ).append( clientspecName ).append( NEWLINE );
-        buf.append( "Root: " ).append( workDir ).append( NEWLINE );
+        buf.append( "Root: " ).append( rootDir ).append( NEWLINE );
         buf.append( "Owner: " ).append( userName ).append( NEWLINE );
         buf.append( "View:" ).append( NEWLINE );
         buf.append( "\t" ).append( PerforceScmProvider.getCanonicalRepoPath( 
repo.getPath() ) );


Reply via email to