The Trunk: SMBase-dtl.92.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: SMBase-dtl.92.mcz

commits-2
David T. Lewis uploaded a new version of SMBase to project The Trunk:
http://source.squeak.org/trunk/SMBase-dtl.92.mcz

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

Name: SMBase-dtl.92
Author: dtl
Time: 1 November 2009, 12:52:35 pm
UUID: 0d33d7d8-5c7a-44d7-a795-3d9d13cf9974
Ancestors: SMBase-nice.91

Fix spelling error in error message

=============== Diff against SMBase-nice.91 ===============

Item was changed:
  ----- Method: SMFileCache>>getStream: (in category 'private') -----
  getStream: aDownloadable
  "Get the stream, either from the original url
  or if that fails, from the server cache - unless
  this is the actual server of course. :)
  We also verify that the sha1sum is correct."
 
  | stream |
  [stream := aDownloadable downloadUrl asUrl retrieveContents contentStream binary.
  (aDownloadable correctSha1sum: stream contents)
+ ifFalse: [self error: 'Incorrect SHA checksum of file from original URL']]
- ifFalse: [self error: 'Incorrect SHA checksum of file from orginal URL']]
  on: Exception do: [:ex |
  Transcript show: 'Download from original url (', aDownloadable downloadUrl, ') failed with this exception: ', ex messageText;cr.
  SMUtilities isServer
  ifTrue: [^nil]
  ifFalse: [
  Transcript show: 'Trying server cache instead.'; cr.
  [stream := (self cacheUrlFor: aDownloadable) asUrl retrieveContents contentStream binary.
  (stream contents size = 21 and: [stream contents asString = 'SMFILEMISSINGONSERVER'])
  ifTrue: [self error: 'File missing in server cache'].
  (stream contents size = 24 and: [stream contents asString = 'SMRELEASENOTDOWNLOADABLE'])
  ifTrue: [self error: 'Release not downloadable'].
  (aDownloadable correctSha1sum: stream contents)
  ifFalse: [self error: 'Incorrect SHA checksum of file from server']]
  on: Exception do: [:ex2 | | msg |
  msg := 'Download from server cache of ', aDownloadable printName, ' failed with this exception: ', ex2 messageText.
  Transcript show: msg; cr.
  self error: msg]]].
  ^ stream!