From c4969eb33ffc103cca9bf463125b36b3cba3661e Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 20 Apr 2020 08:18:19 +0100
Subject: [PATCH] Improve detecting if the (guix lint) module is available

Previously it would cause an error when it's not available, which is a bit
unnecessary.
---
 guix-data-service/jobs/load-new-guix-revision.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index f716950..198c0b2 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -447,16 +447,11 @@ WHERE job_id = $1"
            %package-table)))))
 
   (and
-   (catch
-     'misc-error
-     (lambda ()
-       (inferior-eval '(use-modules (guix lint)) inf)
-       #t)
-     (lambda (key . args)
-       (simple-format (current-error-port)
-                      "warning: failed to load the (guix lint) module: ~A ~A\n"
-                      key args)
-       #f))
+   (or (inferior-eval '(resolve-module '(guix lint) #:ensure #f) inf)
+       (begin
+         (simple-format (current-error-port)
+                        "warning: no (guix lint) module found\n")
+         #f))
    (let ((checkers
           (inferior-eval
            '(begin