Cyril Roelandt <tipec...@gmail.com> skribis:
> * guix/lint (check-patches): Test the output of origin-patches.
> ---
> guix/scripts/lint.scm | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
> index 83dde9a..0fbec1b 100644
> --- a/guix/scripts/lint.scm
> +++ b/guix/scripts/lint.scm
> @@ -152,6 +152,7 @@ Run a set of checkers on the specified package; if none
> is specified, run the ch
> (name (package-name package))
> (full-name (package-full-name package)))
> (if (and patches
> + (every string? patches)
> (any (lambda (patch)
> (let ((filename (basename patch)))
> (not (or (eq? (string-contains filename name) 0)
Instead of requiring every item in ‘patches’ to be a file name, what
about testing each item individually:
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 83dde9a..b613737 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -152,10 +152,15 @@ Run a set of checkers on the specified package; if none is specified, run the ch
(name (package-name package))
(full-name (package-full-name package)))
(if (and patches
- (any (lambda (patch)
+ (any (match-lambda
+ ((? string? patch)
(let ((filename (basename patch)))
(not (or (eq? (string-contains filename name) 0)
- (eq? (string-contains filename full-name) 0)))))
+ (eq? (string-contains filename full-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"
Thanks,
Ludo’.
