Title: [282322] trunk/Tools
- Revision
- 282322
- Author
- [email protected]
- Date
- 2021-09-13 02:24:13 -0700 (Mon, 13 Sep 2021)
Log Message
Unreviewed, AutoInstall hotfix for Linux platforms
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(AutoInstall):
(AutoInstall._request): Disable custom cacert on Linux, OpenSSL fails validate this cert.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (282321 => 282322)
--- trunk/Tools/ChangeLog 2021-09-13 07:52:33 UTC (rev 282321)
+++ trunk/Tools/ChangeLog 2021-09-13 09:24:13 UTC (rev 282322)
@@ -1,3 +1,11 @@
+2021-09-13 Philippe Normand <[email protected]>
+
+ Unreviewed, AutoInstall hotfix for Linux platforms
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (AutoInstall):
+ (AutoInstall._request): Disable custom cacert on Linux, OpenSSL fails validate this cert.
+
2021-09-10 Simon Fraser <[email protected]>
Add an lldb summary provider for the WebCore::Length type
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (282321 => 282322)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-09-13 07:52:33 UTC (rev 282321)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-09-13 09:24:13 UTC (rev 282322)
@@ -407,7 +407,8 @@
packages = defaultdict(list)
manifest = {}
- # Rely on our own certificates for PyPi, since we use PyPi to standardize root certificates
+ # Rely on our own certificates for PyPi, since we use PyPi to standardize root certificates.
+ # This is not needed in Linux platforms.
ca_cert_path = os.path.join(os.path.dirname(__file__), 'cacert.pem')
_previous_index = None
@@ -420,7 +421,11 @@
@classmethod
def _request(cls, url, ca_cert_path=None):
- return urlopen(url, timeout=cls.timeout, cafile=ca_cert_path or cls.ca_cert_path)
+ if sys.platform.startswith('linux'):
+ cafile = None
+ else:
+ cafile = ca_cert_path or cls.ca_cert_path
+ return urlopen(url, timeout=cls.timeout, cafile=cafile)
@classmethod
def enabled(cls):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
