guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: profile: Use _IO* but disable deprecation warning.


From: Ludovic Courtès
Subject: 01/01: profile: Use _IO* but disable deprecation warning.
Date: Sun, 3 Dec 2017 15:55:26 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 2815fca1423cf72e6f3d0e774f1058bcbf8dfdbf
Author: Ludovic Courtès <address@hidden>
Date:   Sun Dec 3 21:50:46 2017 +0100

    profile: Use _IO* but disable deprecation warning.
    
    This fixes a regression introduced in
    2f60084f77815f454d1521396c2a383390ea2865, whereby the profile derivation
    would fail to run on Guile 2.0 (as is the case with "guix package
    --bootstrap").
    
    Reported by Christopher Baines.
    
    * guix/profiles.scm (profile-derivation)[builder]: Use _IO* but add
    'debug-disable' call.
---
 guix/profiles.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 011bc54..d8b83bf 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1268,8 +1268,11 @@ are cross-built for TARGET."
                          (guix search-paths)
                          (srfi srfi-1))
 
-            (setvbuf (current-output-port) 'line)
-            (setvbuf (current-error-port) 'line)
+            ;; Don't complain about _IO* on Guile 2.2.
+            (debug-disable 'warn-deprecated)
+
+            (setvbuf (current-output-port) _IOLBF)
+            (setvbuf (current-error-port) _IOLBF)
 
             #+(if locales? set-utf8-locale #t)
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]