summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-05-05 11:34:20 +0200
committerLudovic Courtès <ludo@gnu.org>2021-05-05 16:56:43 +0200
commite069611866693060976d673ebbc90ea0df767daf (patch)
treeb3424077f7ccb1a3dd1824a52ed5957bc3a20e3c /guix
parentda7f89c73780185ae497aabc77a76cb0d81adc33 (diff)
swh: Adjust for compatibility with Guile 2.2's (web client).
Guile <= 2.2.7 did not support #:verify-certificate? so work around it. * guix/swh.scm (http-get*, http-post*) [! guile-3]: Add variant for Guile 2.2.
Diffstat (limited to 'guix')
-rw-r--r--guix/swh.scm20
1 files changed, 14 insertions, 6 deletions
diff --git a/guix/swh.scm b/guix/swh.scm
index 2402ec98e6..3005323fd1 100644
--- a/guix/swh.scm
+++ b/guix/swh.scm
@@ -148,12 +148,20 @@
url
(string-append url "/")))
-;; XXX: Work around a bug in Guile 3.0.2 where #:verify-certificate? would
-;; be ignored (<https://bugs.gnu.org/40486>).
-(define* (http-get* uri #:rest rest)
- (apply http-request uri #:method 'GET rest))
-(define* (http-post* uri #:rest rest)
- (apply http-request uri #:method 'POST rest))
+(cond-expand
+ (guile-3
+ ;; XXX: Work around a bug in Guile 3.0.2 where #:verify-certificate? would
+ ;; be ignored (<https://bugs.gnu.org/40486>).
+ (define* (http-get* uri #:rest rest)
+ (apply http-request uri #:method 'GET rest))
+ (define* (http-post* uri #:rest rest)
+ (apply http-request uri #:method 'POST rest)))
+ (else ;Guile 2.2
+ ;; Guile 2.2 did not have #:verify-certificate? so ignore it.
+ (define* (http-get* uri #:key verify-certificate? streaming?)
+ (http-request uri #:method 'GET #:streaming? streaming?))
+ (define* (http-post* uri #:key verify-certificate? streaming?)
+ (http-request uri #:method 'POST #:streaming? streaming?))))
(define %date-regexp
;; Match strings like "2014-11-17T22:09:38+01:00" or