mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-15 11:25:22 -05:00
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:
parent
0058888c7e
commit
1d2b542d34
1 changed files with 1 additions and 11 deletions
|
@ -176,17 +176,7 @@ (define (honor-lets-encrypt-certificates! store)
|
|||
(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."
|
||||
|
|
Loading…
Reference in a new issue