suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

protect `raco setup' from files in linked collection dirs

Browse Source 
Patch by Jay McCarthy.

Merge to 5.2.1
This commit is contained in:
Matthew Flatt 2012-01-09 16:46:37 -07:00
parent 8b54dc43c8
commit d56d28f0b6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collects/setup/setup-unit.rkt
View File

@ -305,7 +305,8 @@
(maybe (list (string->path c)) ->cc)) (maybe (list (string->path c)) ->cc))
(for ([cp (in-list (links #:root? #t #:user? #f))] (for ([cp (in-list (links #:root? #t #:user? #f))]
#:when (directory-exists? cp) #:when (directory-exists? cp)
[collection (directory-list cp)]) [collection (directory-list cp)]
#:when (directory-exists? (build-path cp collection)))
(maybe (list collection) ->cc))) (maybe (list collection) ->cc)))
(when (make-user) (when (make-user)
(let ([user-collects (find-user-collects-dir)]) (let ([user-collects (find-user-collects-dir)])
@ -318,7 +319,8 @@
(maybe (list (string->path c)) ->cc)) (maybe (list (string->path c)) ->cc))
(for ([cp (in-list (links #:root? #t))] (for ([cp (in-list (links #:root? #t))]
#:when (directory-exists? cp) #:when (directory-exists? cp)
[collection (directory-list cp)]) [collection (directory-list cp)]
#:when (directory-exists? (build-path cp collection)))
(maybe (list collection) ->cc)))) (maybe (list collection) ->cc))))
(hash-map ht (lambda (k v) v)))) (hash-map ht (lambda (k v) v))))