From bd33d63a25316ceb4ccaffab0154ea462fece405 Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Mon, 15 Sep 2014 19:40:03 +0200 Subject: Also pass CHICKEN release to the hooks --- henrietta-cache.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/henrietta-cache.scm b/henrietta-cache.scm index 9153852..a08ae6a 100644 --- a/henrietta-cache.scm +++ b/henrietta-cache.scm @@ -222,23 +222,26 @@ EOF (egg-release . ,egg-release) (chicken-release . ,*chicken-release*))) (uri (replace-uri-patterns uri-template patterns))) - (printf "\tDownloading egg version ~A from ~A\n" - egg-release uri) + (printf "\tDownloading egg version ~A from ~A (CHICKEN release ~A)\n" + egg-release uri *chicken-release*) (flush-output) (handle-exceptions exn (begin (system (sprintf "rm -rf ~A" (qs cache-dir))) (fprintf (current-error-port) - "Error downloading or extracting egg '~A' release ~A: " - egg-name egg-release) + "Error downloading or extracting egg '~A' release ~A (CHICKEN release ~A): " + egg-name egg-release *chicken-release*) (print-error-message exn (current-error-port)) (flush-output (current-error-port)) (run-hook 'download-release-error + *chicken-release* egg-name egg-release (get-condition-property exn 'exn 'message))) (download-release type uri cache-dir) - (run-hook 'download-release-success egg-name egg-release)))))) + (run-hook 'download-release-success + *chicken-release* + egg-name egg-release)))))) (cdr uri/releases)))) uris/releases))) @@ -249,9 +252,10 @@ EOF (handle-exceptions exn (let ((message (get-condition-property exn 'exn 'message))) (fprintf (current-error-port) - "Could not fetch release-info file for egg ~A from ~A -- ~A\n" - egg-name uri message) - (run-hook 'read-release-info-file-error egg-name uri message) + "Could not fetch release-info file for egg ~A (CHICKEN release ~A) from ~A -- ~A\n" + egg-name *chicken-release* uri message) + (run-hook 'read-release-info-file-error + *chicken-release* egg-name uri message) (flush-output (current-error-port)) '()) (with-input-from-request uri #f read-file))) -- cgit v1.2.3