diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-24 21:56:42 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-24 22:04:51 +0200 |
| commit | 08d7e3592faa93f508cd7f0c30199fe53c87892b (patch) | |
| tree | 9cd4ae44427b5e4466fbad91e530445a07282d85 | |
| parent | 75726135ce017f37ae57181e011ceea95c56dd3a (diff) | |
| download | patches-08d7e3592faa93f508cd7f0c30199fe53c87892b.tar patches-08d7e3592faa93f508cd7f0c30199fe53c87892b.tar.gz | |
ui: Gracefully handle Unicode description strings.
Fixes <http://bugs.gnu.org/21536>.
Reported by Alex Kost <alezost@gmail.com>.
* guix/ui.scm (texi->plain-text): Wrap body in 'with-fluids'.
* tests/ui.scm ("package-description-string vs. Unicode"): New test.
| -rw-r--r-- | guix/ui.scm | 5 | ||||
| -rw-r--r-- | tests/ui.scm | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 4a3630f242..67dd062a34 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -803,7 +803,10 @@ converted to a space; sequences of more than one line break are preserved." (define (texi->plain-text str) "Return a plain-text representation of texinfo fragment STR." - (stexi->plain-text (texi-fragment->stexi str))) + ;; 'texi-fragment->stexi' uses a string port so make sure it's a + ;; Unicode-capable one (see <http://bugs.gnu.org/11197>.) + (with-fluids ((%default-port-encoding "UTF-8")) + (stexi->plain-text (texi-fragment->stexi str)))) (define (package-description-string package) "Return a plain-text representation of PACKAGE description field." diff --git a/tests/ui.scm b/tests/ui.scm index 25fc709431..bd4c907525 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -22,6 +22,7 @@ #:use-module (guix profiles) #:use-module (guix store) #:use-module (guix derivations) + #:use-module (guix tests) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) @@ -89,6 +90,12 @@ interface, and powerful string processing.") (fill-paragraph "First line. Second line" 24)) +(test-equal "package-description-string vs. Unicode" + "b•ll•t\n\n" ;see <http://bugs.gnu.org/21536> + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (package-description-string + (dummy-package "foo" (description "b•ll•t"))))) + (test-equal "package-specification->name+version+output" '(("guile" #f "out") ("guile" "2.0.9" "out") |