[Chicken-hackers] [PATCH] do the right thing when -force'ing "chicken"

[Felix]

When overriding the version check for a "chicken" dependency with
-force, "chicken-install" tried to remove an extension with that name.


cheers,
felix

>From d55167b60199126f63f17e0f2587e413debd0430 Mon Sep 17 00:00:00 2001
From: felix <address@hidden>
Date: Wed, 12 Oct 2011 10:25:30 +0200
Subject: [PATCH 4/4] when using -force chicken-install must handle
 'chicken'-dependency correctly

---
 chicken-install.scm |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/chicken-install.scm b/chicken-install.scm
index dfb5e39..1fd2d7a 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
-- 
1.7.6.msysgit.0