~ chicken-core (chicken-5) 1e8a5ccf626040677f523568eae702cf37b4b08f
commit 1e8a5ccf626040677f523568eae702cf37b4b08f Author: felix <felix@call-with-current-continuation.org> AuthorDate: Wed Jul 5 19:26:19 2023 +0200 Commit: Mario Domenech Goulart <mario@parenteses.org> CommitDate: Wed Jul 5 21:34:15 2023 +0200 handle numeric version properly when constructing egg paths in chicken-install (reported by "siiky") Signed-off-by: Mario Domenech Goulart <mario@parenteses.org> diff --git a/chicken-install.scm b/chicken-install.scm index 4a6eb9b1..d0d9f8aa 100644 --- a/chicken-install.scm +++ b/chicken-install.scm @@ -486,12 +486,14 @@ (else ;; <location>/<egg-name>/<version>/<egg-name>.egg (if version - (values (probe-dir (make-pathname egg-dir version)) version) + (values (probe-dir (make-pathname egg-dir (->string version))) + version) (let ((versions (directory egg-dir))) (if (null? versions) (values #f #f) (let ((latest (car (sort versions version>=?)))) - (values (make-pathname egg-dir latest) latest))))))))) + (values (make-pathname egg-dir (->string latest)) + latest))))))))) (define (write-cache-metadata egg-cache-dir egg-version) (when egg-version @@ -576,7 +578,8 @@ (loop (cdr srvs))))))) ;; The order of probe-dir's here is important. First try ;; the path with version, then the path without version. - ((or (probe-dir (make-pathname (list (car locs) name) lversion)) + ((or (probe-dir (make-pathname (list (car locs) name) + (->string lversion))) (probe-dir (make-pathname (car locs) name))) => (lambda (dir) ;; for locally available eggs, check set of files and diff --git a/manual/Acknowledgements b/manual/Acknowledgements index b9e81398..433103ea 100644 --- a/manual/Acknowledgements +++ b/manual/Acknowledgements @@ -45,7 +45,7 @@ Andreas Rottman, David Rush, Lars Rustemeier, Daniel Sadilek, Otavio Salvador, Burton Samograd, "Sandro", "satori", Aleksej Saushev, Oskar Schirmer, Vasilij Schneidermann, Reed Sheridan, Ronald Schröder, Spencer Schumann, Ivan Shcheklein, Alexander Shendi, Alex Shinn, Ivan -Shmakov, "Shmul", Tony Sidaway, Jeffrey B. Siegal, Andrey Sidorenko, +Shmakov, "Shmul", "siiky", Tony Sidaway, Jeffrey B. Siegal, Andrey Sidorenko, Michele Simionato, Iruata Souza, Volker Stolz, Jon Strait, Dorai Sitaram, Robert Skeels, Sandra Snan, Jason Songhurst, Clifford Stein, David Steiner, "Sunnan", Zbigniew Szadkowski, Rick Taube, Nathan Thern, Mike Thomas, MinhTrap