nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix: lint: Use if/when consistently. 

* guix/scripts/lint.scm (check-synopsis-style): Replace single-branch
  uses of if with when.
  (check-patches): Same
This commit is contained in:
Eric Bavier 2014-10-22 12:01:04 -05:00
parent 86a4126348
commit c04b82ffce
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/scripts/lint.scm
View File

@ -104,21 +104,21 @@
;; Emit a warning if stylistic issues are found in the synopsis of PACKAGE. ;; Emit a warning if stylistic issues are found in the synopsis of PACKAGE.
(define (check-final-period synopsis) (define (check-final-period synopsis)
;; Synopsis should not end with a period, except for some special cases. ;; Synopsis should not end with a period, except for some special cases.
(if (and (string-suffix? "." synopsis) (when (and (string-suffix? "." synopsis)
(not (string-suffix? "etc." synopsis))) (not (string-suffix? "etc." synopsis)))
(emit-warning package (emit-warning package
"no period allowed at the end of the synopsis" "no period allowed at the end of the synopsis"
'synopsis))) 'synopsis)))
(define (check-start-article synopsis) (define (check-start-article synopsis)
(if (or (string-prefix-ci? "A " synopsis) (when (or (string-prefix-ci? "A " synopsis)
(string-prefix-ci? "An " synopsis)) (string-prefix-ci? "An " synopsis))
(emit-warning package (emit-warning package
"no article allowed at the beginning of the synopsis" "no article allowed at the beginning of the synopsis"
'synopsis))) 'synopsis)))
(define (check-synopsis-length synopsis) (define (check-synopsis-length synopsis)
(if (>= (string-length synopsis) 80) (when (>= (string-length synopsis) 80)
(emit-warning package (emit-warning package
"synopsis should be less than 80 characters long" "synopsis should be less than 80 characters long"
'synopsis))) 'synopsis)))
@ -137,20 +137,20 @@
'synopsis))) 'synopsis)))
(let ((synopsis (package-synopsis package))) (let ((synopsis (package-synopsis package)))
(if (string? synopsis)
(begin (begin
(check-synopsis-start-upper-case synopsis) (check-synopsis-start-upper-case synopsis)
(check-final-period synopsis) (check-final-period synopsis)
(check-start-article synopsis) (check-start-article synopsis)
(check-start-with-package-name synopsis) (check-start-with-package-name synopsis)
(check-synopsis-length synopsis))))) (check-synopsis-length synopsis)))))
(when (string? synopsis)
(define (check-patches package) (define (check-patches package)
;; Emit a warning if the patches requires by PACKAGE are badly named. ;; Emit a warning if the patches requires by PACKAGE are badly named.
(let ((patches (and=> (package-source package) origin-patches)) (let ((patches (and=> (package-source package) origin-patches))
(name (package-name package)) (name (package-name package))
(full-name (package-full-name package))) (full-name (package-full-name package)))
(if (and patches (when (and patches
(any (match-lambda (any (match-lambda
((? string? patch) ((? string? patch)
(let ((filename (basename patch))) (let ((filename (basename patch)))