From 5e1808b4c2e8494d394bc479f06cdbbb3d30798d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 3 Nov 2019 15:46:44 +0000 Subject: Work around a problem loading guix revisions Between b13b9384bc43bf93c754c037956c8ef9a99c2b41 and 601171a9bc7ca6e4acb932895a07c0ca9aedfdac, this method failed, so catch the error to allow loading the affected revisions. --- guix-data-service/jobs/load-new-guix-revision.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 2e7eaf4..86c3a78 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -417,7 +417,14 @@ WHERE job_id = $1" (log-time (simple-format #f "getting derivations for ~A" system-target-pairs) (lambda () - (inferior-eval '(invalidate-derivation-caches!) inf) + (catch + 'match-error + (lambda () + (inferior-eval '(invalidate-derivation-caches!) inf)) + (lambda (key . args) + (simple-format + (current-error-port) + "warning: ignoring match-error from calling inferior invalidate-derivation-caches!\n"))) (inferior-eval-with-store inf store (proc packages system-target-pairs))))) (append (map list supported-system-pairs) supported-system-cross-build-pairs))) -- cgit v1.2.3