From 2cd8ea1d706a0999f432485479e1632fbcf001ef Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 2 Jul 2013 06:38:08 -0600 Subject: [PATCH] racket/sandbox: repair for link search paths --- pkgs/sandbox-lib/racket/sandbox.rkt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/sandbox-lib/racket/sandbox.rkt b/pkgs/sandbox-lib/racket/sandbox.rkt index 9c2b693ae2..3952a1d8a0 100644 --- a/pkgs/sandbox-lib/racket/sandbox.rkt +++ b/pkgs/sandbox-lib/racket/sandbox.rkt @@ -925,10 +925,18 @@ `(,@(map (lambda (p) `(read-bytecode ,p)) (append (current-library-collection-paths) - (links #:root? #t #:user? #f) + (apply append + (for/list ([f (get-links-search-files)] + #:when (file-exists? f)) + (links #:root? #t #:file f))) (links #:root? #t #:user? #t) - (map cdr (links #:user? #f #:with-path? #t)) - (map cdr (links #:user? #t #:with-path? #t)))) + (links #:root? #t #:shared? #t) + (apply append + (for/list ([f (get-links-search-files)] + #:when (file-exists? f)) + (map cdr (links #:file f #:with-path? #t)))) + (map cdr (links #:user? #t #:with-path? #t)) + (map cdr (links #:shared? #t #:with-path? #t)))) (read-bytecode ,(PLANET-BASE-DIR)) (exists ,(find-system-path 'addon-dir)) (read ,(build-path (find-system-path 'addon-dir) "links.rktd"))