From 219a8d5b40fbfb886126154118c2e1536f7f13d9 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sat, 23 Jul 2016 21:55:41 +0200 Subject: [PATCH] evaluate: Use 'read' instead of 'eval-string'. --- bin/cuirass.in | 2 +- bin/evaluate.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/cuirass.in b/bin/cuirass.in index d0cd84a..5576944 100644 --- a/bin/cuirass.in +++ b/bin/cuirass.in @@ -87,7 +87,7 @@ if required." (assq-ref spec #:name) "/" (assq-ref spec #:load-path)) (%package-cachedir) - (string-append "'" (object->string spec)))) + (object->string spec))) (jobs (read port))) (close-pipe port) ;; Keep track of SPEC id in the returned jobs. diff --git a/bin/evaluate.in b/bin/evaluate.in index ed9e94b..6998767 100644 --- a/bin/evaluate.in +++ b/bin/evaluate.in @@ -60,10 +60,10 @@ value." (match args ((command load-path cachedir specstr) ;; Load FILE, a Scheme file that defines Hydra jobs. - (let* ((%user-module (make-fresh-user-module)) - (spec (eval-string specstr %user-module)) - (stdout (current-output-port)) - (stderr (current-error-port))) + (let ((%user-module (make-fresh-user-module)) + (spec (with-input-from-string specstr read)) + (stdout (current-output-port)) + (stderr (current-error-port))) (save-module-excursion (λ () (set-current-module %user-module)