>From e3a24ac1be91b29e29543e6d6aeb19651c3589e0 Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Wed, 25 Jul 2018 20:08:52 +1200 Subject: [PATCH 1/4] Fix remote version checking in chicken-install by resolving egg server names Previously, the `check-remote-version' procedure would never expand egg server aliases to their FQDNs, so its calls to `try-list-versions' would always fail (because they'd be hitting, for example, "call-cc" and not "code.call-cc.org"). Add location resolution to this procedure. Also, pull the call to `resolve-location' in the `fetch-egg-sources' procedure up into its loop initialisation, for consistency with the other places in chicken-install.scm where we walk the server list. --- chicken-install.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chicken-install.scm b/chicken-install.scm index 8593745c..d382aed3 100644 --- a/chicken-install.scm +++ b/chicken-install.scm @@ -457,7 +457,7 @@ (let loop ((locs default-locations)) (cond ((null? locs) (let ((tmpdir (create-temporary-directory))) - (let loop ((srvs default-servers)) + (let loop ((srvs (map resolve-location default-servers))) (if (null? srvs) (if lax (print "no connection to server or egg not found remotely - will use cached version") @@ -465,7 +465,7 @@ (begin (d "trying server ~a ...~%" (car srvs)) (receive (dir ver) - (try-download name (resolve-location (car srvs)) + (try-download name (car srvs) version: version destination: tmpdir tests: #t ;; Always fetch tests, otherwise cached eggs can't be tested later @@ -510,7 +510,7 @@ (define (check-remote-version name version lversion cached) (let loop ((locs default-locations)) (cond ((null? locs) - (let loop ((srvs default-servers)) + (let loop ((srvs (map resolve-location default-servers))) (and (pair? srvs) (let ((versions (try-list-versions name (car srvs)))) (or (and versions -- 2.11.0