[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: lint: Use 'with-error-handling'.
From: |
guix-commits |
Subject: |
01/08: lint: Use 'with-error-handling'. |
Date: |
Tue, 25 Aug 2020 18:52:53 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4c5edee1ef2aff2b8f3782ccb03723a6428bf600
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Aug 25 14:49:34 2020 +0200
lint: Use 'with-error-handling'.
This improves the error message when unable to access ~/.cache as
reported by Jonathan Brielmaier <jonathan.brielmaier@web.de> in
<https://bugs.gnu.org/42859>.
* guix/scripts/lint.scm (guix-lint): Wrap body in 'with-error-handling'.
---
guix/scripts/lint.scm | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 97ffd57..5168a1c 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<ludo@gnu.org>
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -174,23 +174,24 @@ run the checkers on all packages.\n"))
(when (assoc-ref opts 'list?)
(list-checkers-and-exit checkers))
- (let ((any-lint-checker-requires-store?
- (any lint-checker-requires-store? checkers)))
-
- (define (call-maybe-with-store proc)
- (if any-lint-checker-requires-store?
- (with-store store
- (proc store))
- (proc #f)))
-
- (call-maybe-with-store
- (lambda (store)
- (cond
- ((null? args)
- (fold-packages (lambda (p r) (run-checkers p checkers
- #:store store)) '()))
- (else
- (for-each (lambda (spec)
- (run-checkers (specification->package spec) checkers
- #:store store))
- args))))))))
+ (with-error-handling
+ (let ((any-lint-checker-requires-store?
+ (any lint-checker-requires-store? checkers)))
+
+ (define (call-maybe-with-store proc)
+ (if any-lint-checker-requires-store?
+ (with-store store
+ (proc store))
+ (proc #f)))
+
+ (call-maybe-with-store
+ (lambda (store)
+ (cond
+ ((null? args)
+ (fold-packages (lambda (p r) (run-checkers p checkers
+ #:store store)) '()))
+ (else
+ (for-each (lambda (spec)
+ (run-checkers (specification->package spec) checkers
+ #:store store))
+ args)))))))))
- branch master updated (e45d7f3 -> 253fcfe), guix-commits, 2020/08/25
- 02/08: gnu: hdf5: Distinguish the default hdf5 version., guix-commits, 2020/08/25
- 01/08: lint: Use 'with-error-handling'.,
guix-commits <=
- 04/08: gnu: hdf5: Use 'package/inherit' for variants., guix-commits, 2020/08/25
- 06/08: gnu: hdf5-parallel-openmpi: Update to 1.10.6., guix-commits, 2020/08/25
- 07/08: gnu: netcdf-parallel-openmpi: Allow MPI tests to pass., guix-commits, 2020/08/25
- 05/08: services: mcron: Validate jobs at build time., guix-commits, 2020/08/25
- 03/08: .dir-locals.el: Add indentation rule for 'package/inherit'., guix-commits, 2020/08/25
- 08/08: gnu: octave: Remove unneeded 'source' field., guix-commits, 2020/08/25