--- a/CVSSourceCodeManager.st	Wed Apr 17 10:19:24 2013 +0200
+++ b/CVSSourceCodeManager.st	Mon Apr 29 19:46:57 2013 +0100
@@ -12,13 +12,13 @@
 "{ Package: 'stx:libbasic3' }"
 
 AbstractSourceCodeManager subclass:#CVSSourceCodeManager
-	instanceVariableNames:''
-	classVariableNames:'CVSRoot RemoteCVS CVSModuleRoots CMD_checkout CVSTempDir
+    instanceVariableNames: ''
+    classVariableNames: 'CVSRoot RemoteCVS CVSModuleRoots CMD_checkout CVSTempDir
 		DisabledModules CVSCommandSemaphore CVSExecutable
 		CVSCommitOptions CVSUpdateOptions CVSCommandTimeout
 		RecentlyCheckedModulesAndPackages'
-	poolDictionaries:''
-	category:'System-SourceCodeManagement'
+    poolDictionaries: ''
+    category: 'System-SourceCodeManagement'
 !
 
 !CVSSourceCodeManager class methodsFor:'documentation'!
@@ -851,7 +851,7 @@
     |tempdir dir|
 
     "/ if CVSTempDir isNil, use current.
-    OperatingSystem errorSignal handle:[:ex |
+    OsError handle:[:ex |
         self reportError:('cannot create temporary directory').
         ^ nil.
     ] do:[
@@ -1113,7 +1113,7 @@
                     ].
                     fileName := (UnixFilename named:s) baseName.
                     (fileName endsWith:',v') ifTrue:[
-                        fileName := fileName copyWithoutLast:2.
+                        fileName := fileName copyButLast:2.
                     ] ifFalse:[
                         self halt:'oops - should not happen'.
                     ].
@@ -1154,7 +1154,7 @@
                     ].
                     fileName := (UnixFilename named:s) baseName.
                     (fileName endsWith:',v') ifTrue:[
-                        fileName := fileName copyWithoutLast:2.
+                        fileName := fileName copyButLast:2.
                     ] ifFalse:[
                         self halt:'oops - should not happen'.
                     ].
@@ -1574,7 +1574,7 @@
     "/
     "/ copy-over our current version
     "/
-    Stream errorSignal handle:[:ex|
+    Error handle:[:ex|
         tempdir recursiveRemove.
         'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
         ^ false.
@@ -2018,7 +2018,7 @@
         "/ this class has already been checked in with a merge,
         "/ but not reloaded from the repository.
         "/ must use the original revision string.
-        revision := revision copyWithoutLast:1.
+        revision := revision copyButLast:1.
     ].
     (binRevision := cls binaryRevision) notNil ifTrue:[
         revision ~= binRevision ifTrue:[
@@ -2761,11 +2761,11 @@
     classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
 
     (classFileName endsWith:',v') ifTrue:[
-        classFileName := classFileName copyWithoutLast:2.
+        classFileName := classFileName copyButLast:2.
     ].
     (classFileName endsWith:'.st') ifTrue:[
         cls notNil ifTrue:[
-            classFileName := classFileName copyWithoutLast:3.
+            classFileName := classFileName copyButLast:3.
         ]
     ].
     fullName := moduleDir , '/' , packageDir , '/' , classFileName.
@@ -2893,7 +2893,7 @@
     and:[cachedFile notNil
     and:[fullTempName exists]])
     ifTrue:[
-        (OperatingSystem errorSignal catch:[
+        (OsError catch:[
             fullTempName moveTo:fullCachedName.
             self activityNotification:'Cached as ',fullCachedName asFilename baseName.
         ]) ifTrue:[
@@ -2963,7 +2963,7 @@
      need a working directory, but reports missing files"
 
     (fullName endsWith:',v') ifTrue:[
-        fullName := fullName copyWithoutLast:2.
+        fullName := fullName copyButLast:2.
     ].
 
     "/ cg: the code below smells - it depends upon no output being generated by cvs.
@@ -3629,7 +3629,7 @@
     "/ create the package directory there
     "/
     packageDir := moduleDir construct:packageDirName.
-    OperatingSystem errorSignal catch:[
+    OsError catch:[
         packageDir recursiveMakeDirectory.
     ].
     packageDir isDirectory ifFalse:[
@@ -4757,7 +4757,7 @@
             fn := info at:#filename ifAbsent:nil.
             fn isNil ifTrue:[
                 container := info at:#container ifAbsent:nil.
-                fn := container asFilename baseName copyWithoutLast:2.   "/ remove ',v' suffix
+                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
                 info at:#filename put:fn.
             ].
             infoCollection at:(info at:#filename) put:info.    
@@ -5194,11 +5194,11 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.448 2013-03-06 10:24:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.450 2013-04-27 12:30:53 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.448 2013-03-06 10:24:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.450 2013-04-27 12:30:53 cg Exp $'
 !
 
 version_HG