05/06: pull: Assume 'set-tls-certificate-locations!' is available.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1d2b542d34ebec498d1424af81220a00ed0d6a24
Author: Ludovic Courtès <address@hidden>
Date:   Tue Sep 18 23:12:30 2018 +0200

    pull: Assume 'set-tls-certificate-locations!' is available.
    
    * guix/scripts/pull.scm (honor-lets-encrypt-certificates!): Call
    'set-tls-certificate-locations!' unconditionally.
---
 guix/scripts/pull.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index c0686f1..04c8ef6 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -176,17 +176,7 @@ Download and deploy the latest version of Guix.\n"))
          (certs (string-append (derivation->output-path drv)
                                "/etc/ssl/certs")))
     (build-derivations store (list drv))
-
-    ;; In the past Guile-Git would not provide this procedure.
-    (if (module-defined? (resolve-interface '(git))
-                         'set-tls-certificate-locations!)
-        (set-tls-certificate-locations! certs)
-        (begin
-          ;; In this case we end up using whichever certificates OpenSSL
-          ;; chooses to use: $SSL_CERT_FILE, $SSL_CERT_DIR, or /etc/ssl/certs.
-          (warning (G_ "cannot enforce use of the Let's Encrypt \
-certificates~%"))
-          (warning (G_ "please upgrade Guile-Git~%"))))))
+    (set-tls-certificate-locations! certs)))
 
 (define (report-git-error error)
   "Report the given Guile-Git error."