[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: lint: Check non-translated package descriptions.
From: |
Mathieu Lirzin |
Subject: |
01/02: lint: Check non-translated package descriptions. |
Date: |
Thu, 24 Sep 2015 21:05:36 +0000 |
mthl pushed a commit to branch master
in repository guix.
commit 2748ee3bcf9373bef58fee7458606fef05626781
Author: Mathieu Lirzin <address@hidden>
Date: Sun Sep 20 12:27:23 2015 +0200
lint: Check non-translated package descriptions.
* guix/ui.scm (texi->plain-text): Export.
* guix/scripts/lint.scm (check-description-style): Use it instead of
'package-description-string'.
---
guix/scripts/lint.scm | 18 +++++++++++-------
guix/ui.scm | 1 +
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 8224f54..95a8e2e 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -143,12 +143,14 @@ monad."
(_ "description should not be empty")
'description)))
- (define (check-texinfo-markup package)
- "Check that PACKAGE description can be parsed as a Texinfo fragment."
+ (define (check-texinfo-markup description)
+ "Check that DESCRIPTION can be parsed as a Texinfo fragment. If the
+markup is valid return a plain-text version of DESCRIPTION, otherwise #f."
(catch 'parser-error
- (lambda () (package-description-string package))
+ (lambda () (texi->plain-text description))
(lambda (keys . args)
- (emit-warning package (_ "Texinfo markup in description is
invalid")))))
+ (emit-warning package (_ "Texinfo markup in description is invalid"))
+ #f)))
(define (check-proper-start description)
(unless (or (properly-starts-sentence? description)
@@ -179,9 +181,11 @@ by two spaces; possible infraction~p at ~{~a~^, ~}")
(let ((description (package-description package)))
(when (string? description)
(check-not-empty description)
- (check-texinfo-markup package)
- (check-proper-start description)
- (check-end-of-sentence-space description))))
+ ;; Use raw description for this because Texinfo rendering automatically
+ ;; fixes end of sentence space.
+ (check-end-of-sentence-space description)
+ (and=> (check-texinfo-markup description)
+ check-proper-start))))
(define (check-inputs-should-be-native package)
;; Emit a warning if some inputs of PACKAGE are likely to belong to its
diff --git a/guix/ui.scm b/guix/ui.scm
index 67dd062..fb8121c 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -75,6 +75,7 @@
switch-symlinks
config-directory
fill-paragraph
+ texi->plain-text
package-description-string
string->recutils
package->recutils