From bbf446b0f46edf2074ba9df29599a4654b4aa8e0 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 15 Oct 2013 12:16:06 -0600 Subject: [PATCH] raco setup: fix dependency checker to distinguish package name from source Closes PR 14095 --- racket/collects/setup/private/pkg-deps.rkt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/racket/collects/setup/private/pkg-deps.rkt b/racket/collects/setup/private/pkg-deps.rkt index 0eeef87129..4642fd9dd7 100644 --- a/racket/collects/setup/private/pkg-deps.rkt +++ b/racket/collects/setup/private/pkg-deps.rkt @@ -2,6 +2,7 @@ (require syntax/modread syntax/modcollapse pkg/lib + pkg/name racket/set racket/string racket/list @@ -93,8 +94,13 @@ (unless deps+build-deps (hash-set! skip-pkgs pkg #t) (setup-printf #f "package declares no dependencies: ~s" pkg)) - (define deps (if deps+build-deps (cdr deps+build-deps) '())) - (define runtime-deps (if deps+build-deps (list->set (car deps+build-deps)) (set))) + (define deps (if deps+build-deps + (filter-map package-source->name (cdr deps+build-deps)) + '())) + (define runtime-deps (if deps+build-deps + (list->set (filter-map package-source->name + (car deps+build-deps))) + (set))) (define implies (list->set (let ([i (get-info/full dir #:namespace metadata-ns)]) (if i