--- a/Filename.st Sat Nov 15 15:59:21 1997 +0100
+++ b/Filename.st Thu Nov 20 18:34:40 1997 +0100
@@ -1342,13 +1342,13 @@
|ok|
self exists ifFalse:[ ^ self].
- self isDirectory ifTrue:[
- ok := OperatingSystem removeDirectory:(self osNameForFile)
+ (self isSymbolicLink not and:[self isDirectory]) ifTrue:[
+ ok := OperatingSystem removeDirectory:(self osNameForFile)
] ifFalse:[
- ok := OperatingSystem removeFile:(self osNameForFile)
+ ok := OperatingSystem removeFile:(self osNameForFile)
].
ok ifFalse:[
- self removeError:self
+ self removeError:self
].
"
@@ -1360,11 +1360,12 @@
'foo' asFilename makeDirectory.
'foo/bar' asFilename writeStream close.
('foo' asFilename remove) ifFalse:[
- Transcript showCR:'could not remove foo'
+ Transcript showCR:'could not remove foo'
]
"
- "Modified: 10.1.1996 / 18:44:50 / cg"
+ "Modified: / 10.1.1996 / 18:44:50 / cg"
+ "Modified: / 20.11.1997 / 17:40:22 / stefan"
!
removeAccessRights:aCollection
@@ -2808,6 +2809,6 @@
!Filename class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.113 1997-11-02 17:32:05 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.114 1997-11-20 17:34:40 stefan Exp $'
! !
Filename initialize!