From 91eb4c90ac341d3c188fb11d91e6523e916dddfd Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 2 Jun 2014 10:58:59 +0100 Subject: [PATCH] fix `collection-file-path` & related for binary package installation Binary package installation failed in the case of collection splicing, because module-name resolution via `collection-file-path` did not check for compiled files along hte search path of registered collection directories. original commit: 43d81b06daab9d74493311d02f95eb1c64517f5e --- .../mzscheme/private/old-procs.rkt | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt index c9dcb62..61861b7 100644 --- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt +++ b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt @@ -21,24 +21,25 @@ (define new:collection-path (let ([collection-path (lambda (collection . collections) - (apply collection-path - (lambda (s) - (raise - (exn:fail:filesystem - (string-append "collection-path: " s) - (current-continuation-marks)))) - collection collections))]) + (collection-path + (lambda (s) + (raise + (exn:fail:filesystem + (string-append "collection-path: " s) + (current-continuation-marks)))) + collection collections))]) collection-path)) (define new:collection-file-path (let ([collection-file-path (lambda (file-name collection . collections) - (apply collection-file-path - (lambda (s) - (raise - (exn:fail:filesystem - (string-append "collection-file-path: " s) - (current-continuation-marks)))) - file-name collection collections))]) + (collection-file-path + (lambda (s) + (raise + (exn:fail:filesystem + (string-append "collection-file-path: " s) + (current-continuation-marks)))) + #f + file-name collection collections))]) collection-file-path))