--- a/CVSSourceCodeManager.st	Tue May 07 18:45:04 2013 +0200
+++ b/CVSSourceCodeManager.st	Tue May 07 18:45:39 2013 +0200
@@ -686,6 +686,8 @@
         |index root|
 
         cvsRoot := self getCVSROOTForModule:aModule.
+        cvsRoot := cvsRoot withoutPrefix:':local:'.
+
         root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
 
         "/ create Repository
@@ -980,6 +982,8 @@
     ].
 
     cvsRoot := self getCVSROOTForModule:moduleName.
+    cvsRoot := cvsRoot withoutPrefix:':local:'.
+
     command := self cvsExecutable.
     (command includes:Character space) ifTrue:[
         command := '"' , command , '"'
@@ -2931,12 +2935,18 @@
 checkForExistingContainer:fileName inModule:moduleDir directory:packageDir
     "check for a container to exist"
 
-    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream|
+    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
+
+    cvsRoot := self getCVSROOTForModule:moduleDir.
+    cvsRoot isNil ifTrue:[^ false].
+
+    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
+        cvsRoot := cvsRoot withoutPrefix:':local:'.
+    ].
 
     fullName := moduleDir , '/' , packageDir , '/' , fileName.
 
-    RemoteCVS ifFalse:[
-        cvsRoot := self getCVSROOTForModule:moduleDir.
+    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
         cvsRoot asFilename exists ifTrue:[
             "/
             "/ with local CVS - simply check if that file exists
@@ -2944,8 +2954,9 @@
             (fullName endsWith:',v') ifFalse:[
                 fullName := fullName , ',v'.
             ].
-            ^ (cvsRoot , '/' , fullName) asFilename exists.
+            ^ (cvsRoot asFilename / fullName) exists.
         ].
+        ^ false
     ].
 
     tempDir := self createTempDirectory:nil forModule:nil.
@@ -5183,11 +5194,11 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.451 2013-05-07 15:29:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.452 2013-05-07 16:45:39 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.451 2013-05-07 15:29:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.452 2013-05-07 16:45:39 cg Exp $'
 ! !