suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed client-side part of PR 8012

Browse Source 
svn: r2709
This commit is contained in:
Jacob Matthews 2006-04-18 19:00:54 +00:00
parent 36e854dbc5
commit fb89fc53ef
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collects/planet/resolver.ss
View File

@ -259,7 +259,6 @@ attempted to load version ~a.~a while version ~a.~a was already loaded"
(define (pkg-spec->full-pkg-spec spec stx) (define (pkg-spec->full-pkg-spec spec stx)
(define (pkg name maj lo hi path) (make-pkg-spec name maj lo hi path stx (version))) (define (pkg name maj lo hi path) (make-pkg-spec name maj lo hi path stx (version)))
(match spec (match spec
[(? string?) (pkg spec #f #f #f '())]
[((? string? path) ...) (pkg (last path) #f 0 #f (drop-last path))] [((? string? path) ...) (pkg (last path) #f 0 #f (drop-last path))]
[((? string? path) ... (? number? maj)) (pkg (last path) maj 0 #f (drop-last path))] [((? string? path) ... (? number? maj)) (pkg (last path) maj 0 #f (drop-last path))]
[((? string? path) ... (? number? maj) min-spec) [((? string? path) ... (? number? maj) min-spec)
@ -453,7 +452,8 @@ attempted to load version ~a.~a while version ~a.~a was already loaded"
[(#f) (abort (format "Server returned invalid HTTP response code ~s" response-code/str))] [(#f) (abort (format "Server returned invalid HTTP response code ~s" response-code/str))]
[(200) [(200)
(let ((maj/str (extract-field "Package-Major-Version" head)) (let ((maj/str (extract-field "Package-Major-Version" head))
(min/str (extract-field "Package-Minor-Version" head))) (min/str (extract-field "Package-Minor-Version" head))
(content-length (extract-field "Content-Length" head)))
(unless (and maj/str min/str (unless (and maj/str min/str
(nat? (string->number maj/str)) (nat? (string->number maj/str))
(nat? (string->number min/str))) (nat? (string->number min/str)))
@ -468,7 +468,9 @@ attempted to load version ~a.~a while version ~a.~a was already loaded"
(close-output-port op) (close-output-port op)
(list #t filename maj min)))] (list #t filename maj min)))]
[(404) [(404)
(list #f (format "Server had no matching package: ~a" (read-line ip)))] (begin0
(list #f (format "Server had no matching package: ~a" (read-line ip)))
(close-input-port ip))]
[(400) [(400)
(abort (format "Internal error (malformed request): ~a" (read-line ip)))] (abort (format "Internal error (malformed request): ~a" (read-line ip)))]
[(500) [(500)