From 46a0fe94904eef20db3fe6e5364736371263cfbe Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 28 Aug 2011 20:01:37 -0600 Subject: [PATCH] fix `compile-omit-files' handling for Planet packages The bug was introduced with changes to support `raco link'. --- collects/setup/setup-unit.rkt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/collects/setup/setup-unit.rkt b/collects/setup/setup-unit.rkt index 5c177033c1..39003f9f4f 100644 --- a/collects/setup/setup-unit.rkt +++ b/collects/setup/setup-unit.rkt @@ -256,13 +256,13 @@ owner pkg-name maj min))))] [_ spec])) - (define (planet->cc path owner pkg-file extra-path maj min) + (define (planet->cc path #:omit-root [omit-root path] owner pkg-file extra-path maj min) (unless (path? path) (error 'planet->cc "non-path when building package ~e" pkg-file)) (and (directory-exists? path) (make-cc* #f path - path + omit-root #f ; don't need info-root; absolute paths in cache.rktd will be ok (get-planet-cache-path) 'abs @@ -275,6 +275,7 @@ (match-let ([(list (list 'planet owner pkg-file extra-path ...) maj min) (cc-shadowing-policy cc)]) (planet->cc (apply build-path (cc-path cc) (map bytes->path subdir)) + #:omit-root (cc-omit-root cc) owner pkg-file (append extra-path subdir)