02/07: download: Honor /etc/ssl/certs when 'SSL_CERT_DIR' is not set.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 674e143cf8e7dff7d62a29c63e43839efc23edba
Author: Ludovic Courtès <address@hidden>
Date:   Mon Oct 21 15:33:32 2019 +0200

    download: Honor /etc/ssl/certs when 'SSL_CERT_DIR' is not set.
    
    * guix/build/download.scm (%x509-certificate-directory): Use
    "/etc/ssl/certs" as a last resort.  This ensures, for instance, that
    'guix download' honors system-wide certificates when SSL_CERT_DIR is
    unset.
---
 guix/build/download.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build/download.scm b/guix/build/download.scm
index 0c9c61d..a4c9155 100644
--- a/guix/build/download.scm
+++ b/guix/build/download.scm
@@ -172,7 +172,8 @@ session record port using PORT as its underlying 
communication port."
 (define %x509-certificate-directory
   ;; The directory where X.509 authority PEM certificates are stored.
   (make-parameter (or (getenv "GUIX_TLS_CERTIFICATE_DIRECTORY")
-                      (getenv "SSL_CERT_DIR"))))  ;like OpenSSL
+                      (getenv "SSL_CERT_DIR")     ;like OpenSSL
+                      "/etc/ssl/certs")))
 
 (define (set-certificate-credentials-x509-trust-file!* cred file format)
   "Like 'set-certificate-credentials-x509-trust-file!', but without the file