~ chicken-core (chicken-5) c43f479c4b9b44964e7ac7f7da4d83e524dc42d9
commit c43f479c4b9b44964e7ac7f7da4d83e524dc42d9
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Oct 12 10:25:30 2011 +0200
Commit: Christian Kellermann <ck@emlix.com>
CommitDate: Wed Oct 12 13:27:49 2011 +0200
when using -force chicken-install must handle 'chicken'-dependency correctly
Signed-off-by: Christian Kellermann <ckeen@pestilenz.org>
diff --git a/chicken-install.scm b/chicken-install.scm
index dfb5e392..1fd2d7a6 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -267,16 +267,18 @@
(->string (car dep))
#f))
((not (version>=? v (->string (cadr dep))))
- (when (and (string=? "chicken" (->string (car dep)))
- (not *force*))
- (error
- (string-append
- "Your CHICKEN version is not recent enough to use this extension - version "
- (cadr dep)
- " or newer is required")))
- (values
- #f
- (cons (->string (car dep)) (->string (cadr dep)))))
+ (cond ((string=? "chicken" (->string (car dep)))
+ (if *force*
+ (values #f #f)
+ (error
+ (string-append
+ "Your CHICKEN version is not recent enough to use this extension - version "
+ (cadr dep)
+ " or newer is required"))))
+ (else
+ (values
+ #f
+ (cons (->string (car dep)) (->string (cadr dep)))))))
(else (values #f #f)))))
(else
(warning
Trap