equal
deleted
inserted
replaced
35 patchDirOrNil := Smalltalk getSystemFileName:patchDirName. |
35 patchDirOrNil := Smalltalk getSystemFileName:patchDirName. |
36 patchDirOrNil notNil ifTrue:[ |
36 patchDirOrNil notNil ifTrue:[ |
37 patchDir := patchDirOrNil asFilename. |
37 patchDir := patchDirOrNil asFilename. |
38 (patchDir exists and:[patchDir isDirectory and:[patchDir isReadable]]) ifTrue:[ |
38 (patchDir exists and:[patchDir isDirectory and:[patchDir isReadable]]) ifTrue:[ |
39 patchDir directoryContents sort do:[:f | |
39 patchDir directoryContents sort do:[:f | |
40 |fn| |
40 |file fn| |
41 |
41 |
42 fn := (patchDir construct:f) name. |
42 fn := (file := patchDir construct:f) name. |
43 Smalltalk splashInfo:('patches [info]: reading patchFile ''' , fn , '''...'). |
43 "JV@2012-08-15: File in only if file is not a directory. Otherwise system |
44 Smalltalk fileIn:fn. |
44 crashes during startup, if one of the patch directories contains another directory |
|
45 (such as CVS)" |
|
46 (file isDirectory not and:[file isReadable]) ifTrue:[ |
|
47 Smalltalk splashInfo:('patches [info]: reading patchFile ''' , fn , '''...'). |
|
48 Smalltalk fileIn:fn. |
|
49 ] |
45 ] |
50 ] |
46 ] |
51 ] |
47 ]. |
52 ]. |
48 ]. |
53 ]. |
49 ! |
54 ! |