From 4ee1518b6457a3cbd8551e2d4fc5811dbaf7df26 Mon Sep 17 00:00:00 2001 From: Espen Henriksen Date: Tue, 20 Sep 2016 22:31:48 +0200 Subject: [PATCH] Add gentoo cert path for OS-DEFAULT Signed-off-by: Espen Henriksen Signed-off-by: Nicolas Sebrecht --- offlineimap/utils/distro.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/offlineimap/utils/distro.py b/offlineimap/utils/distro.py index 8cd2b79..c9167bb 100644 --- a/offlineimap/utils/distro.py +++ b/offlineimap/utils/distro.py @@ -7,7 +7,7 @@ import os # Each dictionary value is either string or some iterable. -# +# # For the former we will just return the value, for an iterable # we will walk through the values and will return the first # one that corresponds to the existing file. @@ -21,6 +21,7 @@ __DEF_OS_LOCATIONS = { ], 'linux-ubuntu': '/etc/ssl/certs/ca-certificates.crt', 'linux-debian': '/etc/ssl/certs/ca-certificates.crt', + 'linux-gentoo': '/etc/ssl/certs/ca-certificates.crt', 'linux-fedora': '/etc/pki/tls/certs/ca-bundle.crt', 'linux-redhat': '/etc/pki/tls/certs/ca-bundle.crt', 'linux-suse': '/etc/ssl/ca-bundle.pem', @@ -43,13 +44,13 @@ def get_os_name(): if OS.startswith('linux'): DISTRO = platform.linux_distribution()[0] if DISTRO: - OS = OS + "-%s" % DISTRO.lower() + OS = OS + "-%s" % DISTRO.split()[0].lower() return OS def get_os_sslcertfile_searchpath(): """Returns search path for CA bundle for the current OS. - + We will return an iterable even if configuration has just a single value: it is easier for our callers to be sure that they can iterate over result.