nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* guix/scripts/pull.scm (honor-lets-encrypt-certificates!): Call
'set-tls-certificate-locations!' unconditionally.
This commit is contained in:
Ludovic Courtès 2018-09-18 23:12:30 +02:00
parent 0058888c7e
commit 1d2b542d34
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/scripts/pull.scm
View File

@ -176,17 +176,7 @@ Download and deploy the latest version of Guix.\n"))
(certs (string-append (derivation->output-path drv) (certs (string-append (derivation->output-path drv)
"/etc/ssl/certs"))) "/etc/ssl/certs")))
(build-derivations store (list drv)) (build-derivations store (list drv))
(set-tls-certificate-locations! certs)))
;; 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~%"))))))
(define (report-git-error error) (define (report-git-error error)
"Report the given Guile-Git error." "Report the given Guile-Git error."