[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/13] lint: Rewrite 'check-patch-file-names'.
From: |
Mathieu Lirzin |
Subject: |
[PATCH 03/13] lint: Rewrite 'check-patch-file-names'. |
Date: |
Sun, 24 Jan 2016 21:19:21 +0100 |
* guix/scripts/lint.scm (check-patch-file-names): Improve clarity by
reversing the logic.
---
guix/scripts/lint.scm | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 25f49a7..e729398 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -413,24 +413,21 @@ warning for PACKAGE mentionning the FIELD."
(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'
+ (guard (c ((message-condition? c) ;raised by 'search-patch'
(emit-warning package (condition-message c)
'patch-file-names)))
- (let ((patches (and=> (package-source package) origin-patches))
- (name (package-name package)))
- (when (and patches
- (any (match-lambda
- ((? string? patch)
- (let ((file (basename patch)))
- (not (eq? (string-contains file name) 0))))
- (_
- ;; This must be an <origin> or something like that.
- #f))
- patches))
- (emit-warning package
- (_ "file names of patches should start with \
-the package name")
- 'patch-file-names)))))
+ (unless (every (match-lambda ;patch starts with package name?
+ ((? string? patch)
+ (and=> (string-contains (basename patch)
+ (package-name package))
+ zero?))
+ (_ #f)) ;must be an <origin> or something like that.
+ (or (and=> (package-source package) origin-patches)
+ '()))
+ (emit-warning
+ package
+ (_ "file names of patches should start with the package name")
+ 'patch-file-names))))
(define (escape-quotes str)
"Replace any quote character in STR by an escaped quote character."
- [PATCH 00/13] New syntax 'address@hidden' and compilation improvements., Mathieu Lirzin, 2016/01/24
- [PATCH 02/13] lint: Remove an unneeded clause in 'check-patch-file-names'., Mathieu Lirzin, 2016/01/24
- [PATCH 01/13] tests: Use 'dummy-origin' for lint tests when possible., Mathieu Lirzin, 2016/01/24
- [PATCH 05/13] packages: Use '@' in package record printers., Mathieu Lirzin, 2016/01/24
- [PATCH 03/13] lint: Rewrite 'check-patch-file-names'.,
Mathieu Lirzin <=
- [PATCH 06/13] build: Generate man pages after compiling guile objects., Mathieu Lirzin, 2016/01/24
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Ludovic Courtès, 2016/01/26
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Mathieu Lirzin, 2016/01/26
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Eric Bavier, 2016/01/28
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Mathieu Lirzin, 2016/01/28
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Eric Bavier, 2016/01/28
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Mathieu Lirzin, 2016/01/28
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Eric Bavier, 2016/01/29
- Re: [PATCH 06/13] build: Generate man pages after compiling guile objects., Mathieu Lirzin, 2016/01/29