lint: patch-file-names: Simplify 'search-patch' error handling.

* guix/lint.scm (check-patch-file-names): Remove 'message-condition?'
guard, which is useless since d51bfe242f.
Remove call to 'format' in the 'formatted-message?' case.
This commit is contained in:
Ludovic Courtès 2020-11-12 09:29:05 +01:00
parent 1cbda46d4a
commit b73981369e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 10 deletions

View File

@ -663,17 +663,11 @@ from ~a")
(define (check-patch-file-names package)
"Emit a warning if the patches requires by PACKAGE are badly named or if the
patch could not be found."
(guard (c ((message-condition? c) ;raised by 'search-patch'
(list
;; Use %make-warning, as condition-mesasge is already
;; translated.
(%make-warning package (condition-message c)
#:field 'patch-file-names)))
((formatted-message? c)
(guard (c ((formatted-message? c) ;raised by 'search-patch'
(list (%make-warning package
(apply format #f
(G_ (formatted-message-string c))
(formatted-message-arguments c))))))
(formatted-message-string c)
(formatted-message-arguments c)
#:field 'source))))
(define patches
(match (package-source package)
((? origin? origin) (origin-patches origin))