From 7e42b8dea220d70d198062d892de172ac25532c7 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 3 Jul 2013 17:54:56 -0600 Subject: [PATCH] scribblings/main: fix installation start page to avoid user-specific packages --- .../racket-index/scribblings/main/private/manuals.rkt | 9 ++------- racket/lib/collects/setup/getinfo.rkt | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/racket-pkgs/racket-index/scribblings/main/private/manuals.rkt b/pkgs/racket-pkgs/racket-index/scribblings/main/private/manuals.rkt index 3d0e5ff4f5..8a44466c61 100644 --- a/pkgs/racket-pkgs/racket-index/scribblings/main/private/manuals.rkt +++ b/pkgs/racket-pkgs/racket-index/scribblings/main/private/manuals.rkt @@ -29,17 +29,12 @@ (if sep? (cons (mk-sep lbl) l) l))])))) (define (get-docs all? tag) - (let* ([recs (find-relevant-directory-records (list tag) 'all-available)] + (let* ([recs (find-relevant-directory-records (list tag) (if all? 'all-available 'no-user))] [infos (map get-info/full (map directory-record-path recs))] - [main-dirs (parameterize ([current-library-collection-paths - (list (find-collects-dir))]) - (for/hash ([k (in-list (find-relevant-directories (list tag) 'no-planet))]) - (values k #t)))] [docs (append-map (lambda (i rec) (define dir (directory-record-path rec)) - (define s (and (or all? (hash-ref main-dirs dir #f)) - i + (define s (and i (i tag))) (if (not s) null diff --git a/racket/lib/collects/setup/getinfo.rkt b/racket/lib/collects/setup/getinfo.rkt index 7982349272..9d4a114577 100644 --- a/racket/lib/collects/setup/getinfo.rkt +++ b/racket/lib/collects/setup/getinfo.rkt @@ -253,7 +253,7 @@ (get-info/full ((path-string?) (#:namespace (or/c namespace? #f)) . ->* . (or/c info? boolean?))) (find-relevant-directories (->* [(listof symbol?)] - [(lambda (x) (memq x '(preferred all-available no-planet no-user)))] + [(or/c 'preferred 'all-available 'no-planet 'no-user)] (listof path?))) (struct directory-record ([maj integer?] @@ -263,5 +263,5 @@ [syms (listof symbol?)])) (find-relevant-directory-records (->* [(listof symbol?)] - [(or/c 'preferred 'all-available 'no-planet)] + [(or/c 'preferred 'all-available 'no-planet 'no-user)] (listof directory-record?))))