[Pkg] Installer: Installer-Core-mtf.240.mcz

[squeak-dev-noreply at lists.squeakfoundation.org]

A new version of Installer-Core was added to project Installer:
http://www.squeaksource.com/Installer/Installer-Core-mtf.240.mcz

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

Name: Installer-Core-mtf.240
Author: mtf
Time: 15 October 2008, 8:44:03 am
UUID: b2ff1420-70ae-401b-a276-9a01ac70751f
Ancestors: Installer-Core-mtf.239

reformatted the retry loop code
Made the delay only happen for speed warnings, not always

=============== Diff against Installer-Core-mtf.239 ===============

Item was changed:
  ----- Method: InstallerWeb>>urlToDownload (in category 'web install') -----
  urlToDownload
  
  	"while we look for a url which returns what we are looking for, we  get the data anyway"
  	
  	| delay retry |
  	delay := 0.
+ 	self class webSearchPath do: [ :pathSpec | | potentialUrl readPathSpec  |
+ 		readPathSpec := pathSpec value readStream.
+ 		potentialUrl := (readPathSpec upTo: $*), self package, (readPathSpec upToEnd ifNil: [ '' ]).
+ 		[ retry := false. pageDataStream := self urlGet: potentialUrl ] doWhileTrue: [ 	
+ 			self wasPbwikiSpeedWarning
+ 				ifTrue: [ retry := true. delay := delay + 5. 
+ 					self logCR: 'PBWiki speed warning. Retrying in ', delay printString, ' seconds'.
+ 					(Delay forSeconds: delay) wait]
+ 				ifFalse: [ self hasPage ifTrue: [ pageDataStream reset. ^ potentialUrl ] ].
+ 			retry ]].
- 	self class webSearchPath 
- 		do: [ :pathSpec | 
- 				| potentialUrl readPathSpec  |
- 				readPathSpec := pathSpec value readStream.
- 				potentialUrl := (readPathSpec upTo: $*), self package, (readPathSpec upToEnd ifNil: [ '' ]).
- 				[ retry := false. pageDataStream := self urlGet: potentialUrl ] 
- 						doWhileTrue: [ 	
- 								self wasPbwikiSpeedWarning
- 									ifTrue: [ retry := true ]
- 									ifFalse: [ self hasPage ifTrue: [ pageDataStream reset. 
- 																^ potentialUrl ] ].
- 				self logCR: 'PBWiki warning. Retrying in ', (delay + 5) printString, ' seconds'.
- 								(Delay forSeconds: (delay := delay + 5)) wait.
- 								retry ]].
  	^nil
  !

Item was changed:
  ----- Method: InstallerUrl>>urlThing (in category 'url') -----
  urlThing
   
  	| retry delay |
  	
  	self logCR: 'retrieving ', self urlToDownload , ' ...'.
  	
  	delay := 0.
  	[ retry := false. pageDataStream := self urlGet: self urlToDownload ] 
  		doWhileTrue: [  	
+ 			self wasPbwikiSpeedWarning ifTrue: [retry := true. delay := delay + 5.
+ 				self logCR: 'PBWiki speed warning. Retrying in ', delay printString, ' seconds'.
+ 				(Delay forSeconds: delay) wait ].
- 			self wasPbwikiSpeedWarning ifTrue: [
- 				self logCR: 'PBWiki warning. Retrying in ', (delay + 5) printString, ' seconds'.
- 				retry := true. (Delay forSeconds: (delay := delay + 5)) wait ].
  											
  			retry ].
  		
  	pageDataStream ifNil: [ self error: 'unable to contact host' ].
  	 
  	^ pageDataStream
  	!