I didn't want to delay too long to get this Installer fix in.


On Thu, Apr 7, 2011 at 12:55 PM,  <commits at source.squeak.org> wrote:
> Chris Muller uploaded a new version of Installer-Core to project The Trunk:
> http://source.squeak.org/trunk/Installer-Core-cmm.349.mcz
>
> ==================== Summary ====================
>
> Name: Installer-Core-cmm.349
> Author: cmm
> Time: 6 April 2011, 1:06:56.486 pm
> UUID: 15cf46e5-c67f-4751-ad8b-b57c3c3fdfd8
> Ancestors: Installer-Core-cmm.348
>
> Sort using the old mcSortFileBlock to restore the legacy behavior.
>
> =============== Diff against Installer-Core-cmm.346 ===============
>
> Item was added:
> + ----- Method: InstallerMonticello>>mcDetectFileBlock: (in category 'monticello') -----
> + mcDetectFileBlock: pkg
> +
> +       pkg isString ifTrue: [  ^ [ :aFile | aFile beginsWith: pkg ] ].
> +
> +       (pkg isKindOf: Array)
> +                       ifTrue: [  ^  [ :aFile | (pkg detect: [ :item | aFile beginsWith: item ] ifNone: [ false ]) ~= false ] ].
> +
> +       pkg isBlock ifTrue: [ ^ pkg ].
> +
> +  !
>
> Item was changed:
>  ----- Method: InstallerMonticello>>mcThing (in category 'monticello') -----
>  mcThing
>        | loader |
>        loader := self classMCVersionLoader new.
>        self logCR: 'reading ' , mc description , '...'.
>        "several attempts to read files - repository readableFileNames
>        sometimes fails"
>        self packages
>                do: [:pkg |
> +                       | versionNames fileToLoad version |
> +                       versionNames := mc versionNamesForPackageNamed:
> +                               (pkg asMCVersionName versionNumber = 0
> +                                       ifTrue: [ "Just a package name specified, use it whole." pkg ]
> +                                       ifFalse: [pkg asMCVersionName packageName]).
> +                       versionNames sort: self mcSortFileBlock.
> +                       fileToLoad := versionNames
> +                                               detect: (self mcDetectFileBlock: pkg)
> +                                               ifNone: [ nil ].
> +                       fileToLoad
> +                               ifNotNil: [version := mc versionNamed: fileToLoad.
> +                                       (version isKindOf: MCConfiguration)
> +                                               ifTrue: [^ version]
> +                                               ifFalse: [MCRepositoryGroup default addRepository: self normalizedRepository.
> +                                                       version workingCopy repositoryGroup addRepository: self normalizedRepository.
> +                                                       loader addVersion: version].
> +                                       self logCR: ' found ' , version fileName , '...']].
> -                       | fileToLoad version |
> -                       fileToLoad := pkg asMCVersionName versionNumber = 0
> -                                               ifTrue: [mc highestNumberedVersionNameForPackageNamed: pkg]
> -                                               ifFalse: [pkg asMCVersionName].
> -                       version := mc versionNamed: fileToLoad.
> -                       (version isKindOf: MCConfiguration)
> -                               ifTrue: [^ version]
> -                               ifFalse: [MCRepositoryGroup default addRepository: self normalizedRepository.
> -                                       version workingCopy repositoryGroup addRepository: self normalizedRepository.
> -                                       loader addVersion: version].
> -                       self logCR: ' found ' , version fileName , '...'].
>        ^ loader!
>
>
>