[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squeak-dev
Subject:    [squeak-dev] The Trunk: Installer-Core-bf.355.mcz
From:       commits () source ! squeak ! org
Date:       2012-05-29 10:12:47
[Download RAW message or body]

Bert Freudenberg uploaded a new version of Installer-Core to project The Trunk:
http://source.squeak.org/trunk/Installer-Core-bf.355.mcz

==================== Summary ====================

Name: Installer-Core-bf.355
Author: bf
Time: 29 May 2012, 12:12:41.76 pm
UUID: b2d1d0b9-838d-45d0-873c-8aae20ca4851
Ancestors: Installer-Core-ul.354

Do not automatically pick latest version from a different branch.
(this currently happened in the FFI repo where the latest versions are \
FFI-Kernel-tbn.25 and FFI-Kernel.threaded-eem.25 and Installer picked the branch over \
the mainline)

=============== Diff against Installer-Core-ul.354 ===============

Item was changed:
  ----- Method: InstallerMonticello>>mcDetectFileBlock: (in category 'monticello') \
-----  mcDetectFileBlock: pkg
  
+ 	pkg isString ifTrue: [  ^ [ :aMCVersionName |
+ 			(pkg beginsWith: aMCVersionName packageAndBranchName) and: [aMCVersionName \
                beginsWith: pkg ] ] ].
- 	pkg isString ifTrue: [  ^ [ :aFile | aFile beginsWith: pkg ] ].
  
  	(pkg isKindOf: Array) 
+ 			ifTrue: [  ^  [ :aMCVersionName | pkg anySatisfy: [ :item |
+ 						(item beginsWith: aMCVersionName packageAndBranchName) and: [aMCVersionName \
                beginsWith: item ] ] ] ].
- 			ifTrue: [  ^  [ :aFile | pkg anySatisfy: [ :item | aFile beginsWith: item ] ] ].
  
  	pkg isBlock ifTrue: [ ^ pkg ].
-   
   !


[prev in list] [next in list] [prev in thread] [next in thread]