>From 67ea739be4ba6cd2366695950a2dfcd1d6da0686 Mon Sep 17 00:00:00 2001 From: Christian Kellermann Date: Wed, 12 Mar 2014 15:42:29 +0100 Subject: [PATCH] Fix bug #1106 chicken-install -deploy dependencies This commit will make chicken-install ignore the local egg db while traversing the dependency list when in deployment mode. This results in all dependencies installed in the deployment directory, instead of just the explicitly stated one in the egg's meta file. I have tested this with a spiffy example and chicken-install -deploy -p $(pwd)/t spiffy Which installs all dependencies of spiffy and intarweb. --- chicken-install.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chicken-install.scm b/chicken-install.scm index 8bfae97..3cf85a9 100644 --- a/chicken-install.scm +++ b/chicken-install.scm @@ -236,8 +236,9 @@ (define (check-dependency dep) (cond ((or (symbol? dep) (string? dep)) (values - (and (not (ext-version dep)) - (->string dep)) + (if *deploy* (->string dep) + (and (not (ext-version dep)) + (->string dep))) #f)) ((and (list? dep) (eq? 'or (car dep))) (let scan ((ordeps (cdr dep)) (bestm #f) (bestu #f)) @@ -260,7 +261,7 @@ ((and (list? dep) (= 2 (length dep)) (or (string? (car dep)) (symbol? (car dep)))) (let ((v (ext-version (car dep)))) - (cond ((not v) + (cond ((or *deploy* (not v)) (values (->string (car dep)) #f)) -- 1.8.5.2