--- a/PerforceSourceCodeManager.st Tue May 07 20:34:47 2013 +0200
+++ b/PerforceSourceCodeManager.st Tue May 07 20:37:43 2013 +0200
@@ -365,38 +365,7 @@
createTempDirectory:packageDir forModule:moduleDir
"create a temp directory for checking out"
- |tempdir dir|
-
- "/ if CVSTempDir isNil, use current.
- OsError handle:[:ex |
- self reportError:('cannot create temporary directory').
- ^ nil.
- ] do:[
- tempdir := Filename newTemporaryDirectoryIn:(self perforceTmpDirectory).
- ].
-
- moduleDir notNil ifTrue:[
- dir := tempdir construct:moduleDir.
- dir makeDirectory.
-
- packageDir notNil ifTrue:[
- dir := dir construct:packageDir.
- dir recursiveMakeDirectory.
- ].
- dir exists ifFalse:[
- (tempdir construct:moduleDir) recursiveRemove.
- tempdir recursiveRemove.
- self reportError:('cannot create temporary directory').
- ^ nil.
- ].
- ].
- ^ tempdir
-
- "self createTempDirectory:'fooPackage' forModule:'fooModule'"
-
- "Created: / 09-12-1995 / 19:14:35 / cg"
- "Modified: / 19-12-1995 / 16:13:02 / stefan"
- "Modified: / 29-08-2006 / 13:16:23 / cg"
+ ^ self createTempDirectory:packageDir forModule:moduleDir in:(self perforceTmpDirectory)
!
ensureDollarsInVersionMethod:aString
@@ -1839,7 +1808,7 @@
Timestamp now printOn:s format:'%h-%m-%s.%i'.
versionInfo time:s contents.
PerforceVersionInfo fromRCSString:versionInfo getVersionString.
- PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.31 2013-04-27 12:46:11 cg Exp $'
+ PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
"
"Modified: / 01-06-2012 / 13:32:40 / cg"
@@ -1940,10 +1909,10 @@
!PerforceSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.31 2013-04-27 12:46:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.31 2013-04-27 12:46:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
! !