From 0f04df269157ee005d7030196780c738c67c5a0a Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Fri, 1 Jul 2016 13:21:59 +0200 Subject: Avoid pattern matching on records which relies on slot order. --- bin/cuirass.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'bin') diff --git a/bin/cuirass.in b/bin/cuirass.in index 15ca948..edcf940 100644 --- a/bin/cuirass.in +++ b/bin/cuirass.in @@ -26,8 +26,7 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" (cuirass database) (cuirass job) (cuirass ui) - (ice-9 getopt-long) - (ice-9 match)) + (ice-9 getopt-long)) (define* (show-help prog) (simple-format #t "Usage: ~a [OPTIONS] [CACHEDIR]" prog) @@ -60,13 +59,14 @@ Run Guix job from a git repository cloned in CACHEDIR. DIR if required." (or (file-exists? cachedir) (mkdir cachedir)) (with-directory-excursion cachedir - (match spec - (($ name url branch) - (or (file-exists? name) (system* "git" "clone" url name)) - (with-directory-excursion name - (and (zero? (system* "git" "fetch")) - (zero? (system* "git" "reset" "--hard" - (string-append "origin/" branch))))))))) + (let ((name (job-name job)) + (url (job-url job)) + (branch (job-branch job))) + (or (file-exists? name) (system* "git" "clone" url name)) + (with-directory-excursion name + (and (zero? (system* "git" "fetch")) + (zero? (system* "git" "reset" "--hard" + (string-append "origin/" branch)))))))) (define (evaluate store db cachedir spec) "Evaluate and build package derivations. Return a list a jobs." -- cgit v1.2.3