From f85221afca5d60c17223e88e38275affd577ab16 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 22 Jul 2013 16:34:21 -0600 Subject: [PATCH] adjust ".plt" S-expression matching to accept more old archives --- racket/collects/setup/unpack.rkt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/racket/collects/setup/unpack.rkt b/racket/collects/setup/unpack.rkt index 98c690d393..2c50e95a08 100644 --- a/racket/collects/setup/unpack.rkt +++ b/racket/collects/setup/unpack.rkt @@ -286,8 +286,9 @@ [(conflicts) ',conflicts] [(plt-relative?) ,plt-relative?] [(plt-home-relative?) ,plt-home-relative?] - [(test-plt-dirs) ,test-dirs] ; #f or `(quote ,dirs) - [else (failure)])) + . ,(or `([(test-plt-dirs) ,test-dirs] ; #f or `(quote ,dirs) + [else (failure)]) + `([,(and 'else test-dirs) (failure)])))) (lambda (request failure) (case request [(name) name] @@ -297,6 +298,7 @@ [(plt-relative?) plt-relative?] [(plt-home-relative?) plt-home-relative?] [(test-plt-dirs) (and test-dirs + (not (eq? test-dirs 'else)) (cadr test-dirs))] [else (failure)]))] [else @@ -444,7 +446,8 @@ (print-status (format "Unpacking ~a from ~a" name archive)) (let ([u (read p)]) (match u - [`(unit (import main-collects-parent-dir mzuntar) (export) + [`(unit (import ,(? symbol?) mzuntar) + (export) (mzuntar void) (quote ,collections)) (make-directory* (car target-dir-info))