~ chicken-core (chicken-5) 95674354bb5cb76100cc3552f81c146b8e650e99

commit 95674354bb5cb76100cc3552f81c146b8e650e99
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sat Apr 23 23:29:51 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sat Apr 23 23:29:51 2011 +0200

    override msg in progress output for chicken-install; scan/override fixes

diff --git a/chicken-install.scm b/chicken-install.scm
index c55cfc88..74b8ebf0 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -325,18 +325,21 @@
 		 " (" (let ((v (assq 'version (extension-information (car e))))) 
 			(if v (cadr v) "???"))
 		 " -> " (cdr e) ")"
-		 #\newline) )
-	       upgrade)
-	 '("\nDo you want to replace the existing extensions?"))) )))
+		 #\newline) )))
+       upgrade)
+      '("\nDo you want to replace the existing extensions?"))))
 
   (define (override-version egg)
     (let ((name (string->symbol (if (pair? egg) (car egg) egg))))
       (cond ((assq name *override*) =>
 	     (lambda (a)
-	       (when (and (pair? egg) (not (equal? (cadr a) (cdr egg))))
-		 (warning
-		  (sprintf "version `~a' of extension `~a' overrides explicitly given version `~a'"
-		    (cadr a) name (cdr egg))))
+	       (cond ((and (pair? egg) (not (equal? (cadr a) (cdr egg))))
+		      (warning
+		       (sprintf 
+			   "version `~a' of extension `~a' overrides explicitly given version `~a'"
+			 (cadr a) name (cdr egg))))
+		     (else
+		      (print "overriding: " a)))
 	       (cadr a)))
 	    ((pair? egg) (cdr egg))
 	    (else #f))))
@@ -609,7 +612,7 @@
   (define (scan-directory dir)
     (for-each
      (lambda (info)
-       (pp (cons (car info) (cadr info))))
+       (pp (cons (car info) (cadadr info))))
      (gather-egg-information dir)))      
 
   (define ($system str)
@@ -799,7 +802,7 @@ EOF
 		       ((string=? "-override" arg)
                         (unless (pair? (cdr args)) (usage 1))
 			(set! *override* (read-file (cadr args)))
-			(loop (cddr args) eggs))			
+			(loop (cddr args) eggs))
 		       ((string=? "-trunk" arg)
 			(set! *trunk* #t)
 			(loop (cdr args) eggs))
diff --git a/chicken-status.scm b/chicken-status.scm
index d9b3ec5d..3e7d59df 100644
--- a/chicken-status.scm
+++ b/chicken-status.scm
@@ -106,7 +106,7 @@
     (for-each
      (lambda (egg)
        (let ((version (assq 'version (read-info egg (repo-path)))))
-	 (pp (list (string->symbol egg) (and version (cadr version))))))
+	 (pp (list (string->symbol egg) (->string (and version (cadr version)))))))
      (gather-all-eggs)))
 
   (define (usage code)