diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-09-18 23:12:30 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-09-18 23:23:44 +0200 |
| commit | 1d2b542d34ebec498d1424af81220a00ed0d6a24 (patch) | |
| tree | 097eb147501e1d8a8a8d48891ae7622f80f1de18 | |
| parent | 0058888c7efe4063f80180ff446513869420423f (diff) | |
| download | patches-1d2b542d34ebec498d1424af81220a00ed0d6a24.tar patches-1d2b542d34ebec498d1424af81220a00ed0d6a24.tar.gz | |
pull: Assume 'set-tls-certificate-locations!' is available.
* guix/scripts/pull.scm (honor-lets-encrypt-certificates!): Call
'set-tls-certificate-locations!' unconditionally.
| -rw-r--r-- | guix/scripts/pull.scm | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index c0686f16bf..04c8ef672f 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." |