[Vm-dev] VM Maker: Cog-eem.170.mcz

[commits at source.squeak.org]

Eliot Miranda uploaded a new version of Cog to project VM Maker:
http://source.squeak.org/VMMaker/Cog-eem.170.mcz

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

Name: Cog-eem.170
Author: eem
Time: 20 July 2014, 9:13:09.146 am
UUID: 9eb639f5-0541-4205-95f2-894647dbe444
Ancestors: Cog-eem.169

Argh!! Make sure patchAndUploadNewer only patches
unbranched packages.

=============== Diff against Cog-eem.169 ===============

Item was changed:
  ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchAndUploadNewer (in category 'patching') -----
  patchAndUploadNewer
  	"Look for unbranched versions on the default repository that are newer than the
  	 image''s versions. Download and patch them and upload the patched versions."
  	"(SpurBootstrapMonticelloPackagePatcher new
  		from: 'spurpackages'
  		to: 'trunkpackages')
  			patchAndUploadNewer"
  	| repo sourceRepo |
  	sourceDir deleteLocalFiles.
  	destDir deleteLocalFiles.
  	repo := self repositoryForUrl: MCMcmUpdater defaultUpdateURL.
  	sourceRepo := MCDirectoryRepository directory: sourceDir.
  	repo cacheAllFileNamesDuring:
  		[self packagesAndPatches keys do:
  			[:package| | workingCopy |
  			workingCopy := MCWorkingCopy allManagers detect: [:pkg| pkg packageName = package packageName].
  			(workingCopy possiblyNewerVersionsIn: repo) do:
+ 				[:newerVersion|
+ 				 newerVersion packageAndBranchName = package packageName ifTrue: "Don't patch already patched packages!!!!"
+ 					[(sourceRepo includesVersionNamed: newerVersion) ifFalse:
+ 						[sourceRepo storeVersion: (repo versionNamed: newerVersion)]]]].
- 				[:newerVersion | 
- 				(sourceRepo includesVersionNamed: newerVersion) ifFalse:
- 					[sourceRepo storeVersion: (repo versionNamed: newerVersion)]]].
  		 self patchAsNeeded.
+ 		 self uploadFrom: (MCDirectoryRepository directory: destDir) to: repo]!
- 		 self uploadFrom: (MCDirectoryRepository directory: destDir) to: self trunk]!