~ chicken-core (chicken-5) 94c3ee4238a8e947e0f8769e70036aa0eb103153
commit 94c3ee4238a8e947e0f8769e70036aa0eb103153 Author: felix <felix@call-with-current-continuation.org> AuthorDate: Fri Apr 7 18:01:47 2017 +0200 Commit: felix <felix@call-with-current-continuation.org> CommitDate: Fri Apr 7 18:01:47 2017 +0200 chicken-install: in verbose mode, show locs/servers tried diff --git a/chicken-install.scm b/chicken-install.scm index 7c13292f..91ba0d3a 100644 --- a/chicken-install.scm +++ b/chicken-install.scm @@ -444,27 +444,30 @@ (if lax (print "no connection to server or egg not found remotely - will use cached version") (error "extension or version not found")) - (receive (dir ver) - (try-download name (resolve-location (car srvs)) - version: version - destination: tmpdir - tests: run-tests - proxy-host: proxy-host - proxy-port: proxy-port - proxy-user-pass: proxy-user-pass) - (cond (dir - (copy-egg-sources tmpdir dest) - (delete-directory tmpdir #t) - (when ver - (with-output-to-file - (make-pathname dest +version-file+) - (cut write ver))) - (with-output-to-file - (make-pathname dest +timestamp-file+) - (cut write (current-seconds)))) - (else (loop (cdr srvs))))))))) + (begin + (d "trying server ~a ...~%" (car srvs)) + (receive (dir ver) + (try-download name (resolve-location (car srvs)) + version: version + destination: tmpdir + tests: run-tests + proxy-host: proxy-host + proxy-port: proxy-port + proxy-user-pass: proxy-user-pass) + (cond (dir + (copy-egg-sources tmpdir dest) + (delete-directory tmpdir #t) + (when ver + (with-output-to-file + (make-pathname dest +version-file+) + (cut write ver))) + (with-output-to-file + (make-pathname dest +timestamp-file+) + (cut write (current-seconds)))) + (else (loop (cdr srvs)))))))))) ((probe-dir (make-pathname (car locs) name)) => (lambda (dir) + (d "trying location ~a ...~%" dir) (let* ((eggfile (make-pathname dir name +egg-extension+)) (info (validate-egg-info (load-egg-info eggfile))) (rversion (get-egg-property info 'version))) @@ -473,7 +476,7 @@ (copy-egg-sources dir dest) (loop (cdr locs)))))) (else (loop (cdr locs)))))) - + (define (copy-egg-sources from to) ;;XXX should probably be done manually, instead of calling tool (let ((cmd (quote-allTrap