16419: Use CAINFO instead of CAPATH
authorPeter Amstutz <peter.amstutz@curii.com>
Thu, 21 May 2020 13:51:03 +0000 (09:51 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Thu, 21 May 2020 13:51:03 +0000 (09:51 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

sdk/python/arvados/keep.py

index 9601601d42fd9677518674bebce71319e8e819e3..bc43b849c3a01dd661c4ba080d83f65f597adde6 100644 (file)
@@ -376,7 +376,7 @@ class KeepClient(object):
                     if self.insecure:
                         curl.setopt(pycurl.SSL_VERIFYPEER, 0)
                     else:
-                        curl.setopt(pycurl.CAPATH,os.path.dirname(arvados.util.ca_certs_path()))
+                        curl.setopt(pycurl.CAINFO, arvados.util.ca_certs_path())
                     if method == "HEAD":
                         curl.setopt(pycurl.NOBODY, True)
                     self._setcurltimeouts(curl, timeout, method=="HEAD")
@@ -476,7 +476,7 @@ class KeepClient(object):
                     if self.insecure:
                         curl.setopt(pycurl.SSL_VERIFYPEER, 0)
                     else:
-                        curl.setopt(pycurl.CAPATH,os.path.dirname(arvados.util.ca_certs_path()))
+                        curl.setopt(pycurl.CAINFO, arvados.util.ca_certs_path())
                     self._setcurltimeouts(curl, timeout)
                     try:
                         curl.perform()