01/18: swh: Adjust for compatibility with Guile 2.2's (web client).

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e069611866693060976d673ebbc90ea0df767daf
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed May 5 11:34:20 2021 +0200

    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.
---
 guix/swh.scm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/guix/swh.scm b/guix/swh.scm
index 2402ec9..3005323 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