GNU bug report logs - #33012
[PATCH 3/3] ui: Fix port-buffering with guile@2.0.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Eric Bavier <ericbavier <at> centurylink.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#33012: closed ([PATCH 3/3] ui: Fix port-buffering with
 guile <at> 2.0.)
Date: Tue, 16 Oct 2018 22:32:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Tue, 16 Oct 2018 17:31:23 -0500
with message-id <20181016173123.1d333201 <at> centurylink.net>
and subject line Re: [bug#33012] [PATCH 3/3] ui: Fix port-buffering with guile <at> 2.0.
has caused the debbugs.gnu.org bug report #33012,
regarding [PATCH 3/3] ui: Fix port-buffering with guile <at> 2.0.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
33012: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33012
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: ericbavier <at> centurylink.net
To: guix-patches <at> gnu.org
Cc: Eric Bavier <bavier <at> cray.com>
Subject: [PATCH 3/3] ui: Fix port-buffering with guile <at> 2.0.
Date: Wed, 10 Oct 2018 20:52:46 -0500

From: Eric Bavier <bavier <at> cray.com>

* guix/status.scm (build-event-output-port)[guile <at> 2.0]: Do not call 'setvbuf'
on custom binary port.
* tests/status.scm (current-build-output-port, UTF-8 + garbage)[guile <at> 2.0]:
Use "?" in place of REPLACEMENT CHARACTER.
---
 guix/status.scm  | 5 +++--
 tests/status.scm | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/guix/status.scm b/guix/status.scm
index 13537c70c..6dba7e049 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -502,8 +502,9 @@ The second return value is a thunk to retrieve the current state."

   ;; The build port actually receives Unicode strings.
   (set-port-encoding! port "UTF-8")
-  (setvbuf port (cond-expand (guile-2.2 'line) (else _IOLBF)))
-
+  (cond-expand
+    ((and guile-2 (not guile-2.2)) #t)
+    (else (setvbuf port 'line)))
   (values port (lambda () %state)))

 (define (call-with-status-report on-event thunk)
diff --git a/tests/status.scm b/tests/status.scm
index 486ad04dd..846a6f415 100644
--- a/tests/status.scm
+++ b/tests/status.scm
@@ -124,7 +124,10 @@

 (test-equal "current-build-output-port, UTF-8 + garbage"
   ;; What about a mixture of UTF-8 + garbage?
-  '((build-log "garbage: �lambda: λ\n"))
+  (let ((replacement (cond-expand
+                      ((and guile-2 (not guile-2.2)) "?")
+                      (else "�"))))
+    `((build-log ,(string-append "garbage: " replacement "lambda: λ\n"))))
   (let-values (((port get-status) (build-event-output-port cons '())))
     (display "garbage: " port)
     (put-bytevector port #vu8(128))
--
2.19.0

[Message part 3 (message/rfc822, inline)]

From: Eric Bavier <ericbavier <at> centurylink.net>
To: 33012-done <at> debbugs.gnu.org
Subject: Re: [bug#33012] [PATCH 3/3] ui: Fix port-buffering with guile <at> 2.0.
Date: Tue, 16 Oct 2018 17:31:23 -0500

[Message part 4 (text/plain, inline)]

On Sun, 14 Oct 2018 23:43:28 +0200
ludo <at> gnu.org (Ludovic Courtès) wrote:

> ericbavier <at> centurylink.net skribis:
> 
> > From: Eric Bavier <bavier <at> cray.com>
> >
> > * guix/status.scm (build-event-output-port)[guile <at> 2.0]: Do not call 'setvbuf'
> > on custom binary port.
> > * tests/status.scm (current-build-output-port, UTF-8 + garbage)[guile <at> 2.0]:
> > Use "?" in place of REPLACEMENT CHARACTER.  
> 
> LGTM, thanks!
> 
> Ludo'.

Pushed in 278f86a43f1561b1c064ce88da012db414ec7efc

[Message part 5 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.