[squeak-dev] The Trunk: Installer-Core-cmm.344.mcz

Chris Muller asqueaker at gmail.com
Sat Mar 5 20:07:11 UTC 2011


I did not intend this for the Inbox yet.  It's been deleted for now.

On Sat, Mar 5, 2011 at 2:04 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.344.mcz
>
> ==================== Summary ====================
>
> Name: Installer-Core-cmm.344
> Author: cmm
> Time: 5 March 2011, 2:04:43.252 pm
> UUID: f838170c-ff2e-4991-a5cd-0a13f93107b0
> Ancestors: Installer-Core-mtf.343
>
> - Removed external call to #readableFileNames as part of the effort to allow MC to scale.  This means InstallerMonticello will no longer accept an external detect-block for package versions; just a Package names.
>
> =============== Diff against Installer-Core-mtf.343 ===============
>
> Item was removed:
> - ----- 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 files count |
> -
>        loader := self classMCVersionLoader new.
> +       self logCR: 'reading ' , mc description , '...'.
> +       "several attempts to read files - repository readableFileNames sometimes fails"
> +       self packages do:
> +               [ : pkg | | fileToLoad version |
> +               fileToLoad := mc highestNumberedVersionNameForPackageNamed: pkg.
> -
> -       count := 0. files := nil.
> -       self logCR: 'reading ', mc description, '...'.
> -               "several attempts to read files - repository readableFileNames sometimes fails"
> -       [ count := count + 1.
> -        (files = nil) and:[ count < 5 ] ]
> -               whileTrue: [files := mc readableFileNames sort: self mcSortFileBlock ].
> -       files ifNil: [  Warning signal: 'Repository not readable: ', mc description. ^ nil  ].
> -
> -       self packages do: [ :pkg |
> -               | fileToLoad version |
> -
> -               self log: 'finding ', pkg asString, '...'.
> -
> -               fileToLoad := files detect: (self mcDetectFileBlock: pkg) ifNone: [ nil ].
> -
>                version := mc versionFromFileNamed: fileToLoad.
> +               (version isKindOf: MCConfiguration)
> -               (version isKindOf: MCConfiguration)
>                        ifTrue: [ ^ version ]
> +                       ifFalse:
> +                               [ MCRepositoryGroup default addRepository: self normalizedRepository.
> -                       ifFalse:[
> -                               MCRepositoryGroup default addRepository: self normalizedRepository.
>                                version workingCopy repositoryGroup addRepository: self normalizedRepository.
>                                loader addVersion: version ].
> +               self logCR: ' found ' , version fileName , '...' ].
> -
> -               self logCR: ' found ', version fileName, '...'.
> -       ].
> -
>        ^ loader!
>
>
>



More information about the Squeak-dev mailing list