~ chicken-core (chicken-5) b0439fca1a9971b11b151fe1a5582d3b2e0a7b40
commit b0439fca1a9971b11b151fe1a5582d3b2e0a7b40
Author: felix <felix@y.(none)>
AuthorDate: Thu Mar 11 20:12:20 2010 +0100
Commit: felix <felix@y.(none)>
CommitDate: Thu Mar 11 20:12:20 2010 +0100
combined short options where incorrectly handled in chicken-install
diff --git a/chicken-install.scm b/chicken-install.scm
index 638f5bb6..8766073d 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -518,11 +518,11 @@ EOF
(let ((setups (glob "*.setup")))
(cond ((pair? setups)
(set! *eggs+dirs+vers*
- (append
- (map
- (lambda (s) (cons (pathname-file s) (list "." "")))
- setups)
- *eggs+dirs+vers*)))
+ (append
+ (map
+ (lambda (s) (cons (pathname-file s) (list "." "")))
+ setups)
+ *eggs+dirs+vers*)))
(else
(print "no setup-scripts to process")
(exit 1))) ) )
@@ -619,9 +619,9 @@ EOF
(char=? #\- (string-ref arg 0)))
(if (> (string-length arg) 2)
(let ((sos (string->list (substring arg 1))))
- (if (null? (lset-intersection eq? *short-options* sos))
- (loop (append (map (cut string #\- <>) sos) (cdr args)) eggs)
- (usage 1)))
+ (if (every (cut memq <> *short-options*) sos)
+ (loop (append (map (cut string #\- <>) sos) (cdr args)) eggs)
+ (usage 1)))
(usage 1)))
((equal? "setup" (pathname-extension arg))
(let ((egg (pathname-file arg)))
Trap