* [PATCH] Fix Guile version checking in the "web" code.
@ 2013-06-10 8:45 Cyril Roelandt
2013-06-10 9:00 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Cyril Roelandt @ 2013-06-10 8:45 UTC (permalink / raw)
To: bug-guix
* 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix Guile version checking in the "web" code.
2013-06-10 8:45 [PATCH] Fix Guile version checking in the "web" code Cyril Roelandt
@ 2013-06-10 9:00 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2013-06-10 9:00 UTC (permalink / raw)
To: Cyril Roelandt; +Cc: bug-guix
Cyril Roelandt <tipecaml@gmail.com> skribis:
> * 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.
Good catch! Please push.
Thanks for the bug hunt!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-10 9:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-10 8:45 [PATCH] Fix Guile version checking in the "web" code Cyril Roelandt
2013-06-10 9:00 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.