From 91ac5138cacb0677286744190cf6e0ca5f6a5616 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 15 Oct 2013 07:02:54 -0600 Subject: [PATCH] raco pkg: fix access of 'default version info Includes repair to `raco pkg catalog-show` to use the 'version table in a package description. --- racket/collects/pkg/lib.rkt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/racket/collects/pkg/lib.rkt b/racket/collects/pkg/lib.rkt index d2cc21d2c3..7eeb6482a4 100644 --- a/racket/collects/pkg/lib.rkt +++ b/racket/collects/pkg/lib.rkt @@ -350,7 +350,7 @@ [(hash? v) (or (for/or ([vers (in-list (list (current-pkg-scope-version) 'default))]) - (define ht2 (hash-ref v (current-pkg-scope-version) #f)) + (define ht2 (hash-ref v vers #f)) (and ht2 ;; Override fields of `ht' with values from `ht2': (for/fold ([ht ht]) ([(k v) (in-hash ht2)]) @@ -2514,9 +2514,10 @@ (for ([name (in-list (if all? (hash-keys all-details) names))]) - (define details (if all? - (hash-ref all-details name) - (get-pkg-details-from-catalogs name))) + (define details (select-info-version + (if all? + (hash-ref all-details name) + (get-pkg-details-from-catalogs name)))) (printf "Package name: ~a\n" name) (for ([key '(author source checksum tags description)]) (define v (hash-ref details key #f))