bug-guix
[Top][All Lists]
Advanced

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

[PATCH] Fix Guile version checking in the "web" code.


From: Cyril Roelandt
Subject: [PATCH] Fix Guile version checking in the "web" code.
Date: Mon, 10 Jun 2013 10:45:22 +0200

* guix/web.scm (http-fetch): fix Guile version checking. The previous version
would use features from Guile 2.0.9+ when using Guile 2.0.7.
---
 guix/web.scm |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/guix/web.scm b/guix/web.scm
index e9c69cb..d24f158 100644
--- a/guix/web.scm
+++ b/guix/web.scm
@@ -157,14 +157,13 @@ unbuffered port, suitable for use in `filtered-port'."
                    ;; Try hard to use the API du jour to get an input port.
                    ;; On Guile 2.0.5 and before, we can only get a string or
                    ;; bytevector, and not an input port.  Work around that.
-                   (if (version>? "2.0.7" (version))
-                       (if (defined? 'http-get*)
-                           (http-get* uri #:decode-body? text?
-                                      #:port port)              ; 2.0.7
-                           (http-get uri #:decode-body? text?
-                                     #:port port))              ; 2.0.5-
-                       (http-get uri #:streaming? #t
-                                 #:port port)))                 ; 2.0.9+
+                  (if (version>? (version) "2.0.7")
+                      (http-get uri #:streaming? #t #:port port) ; 2.0.9+
+                      (if (defined? 'http-get*)
+                          (http-get* uri #:decode-body? text?
+                                     #:port port)                ; 2.0.7
+                          (http-get uri #:decode-body? text?
+                                    #:port port))))              ; 2.0.5-
                   ((code)
                    (response-code resp)))
       (case code
-- 
1.7.10.4




reply via email to

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