Changeset 244513 in webkit

Timestamp:

Apr 22, 2019 3:07:47 PM (5 years ago)

Author:

dean_johnson@apple.com

Message:

Use curl to download packages for webkitpy autoinstaller
​https://bugs.webkit.org/show_bug.cgi?id=197164

Reviewed by Darin Adler.

• Scripts/webkitpy/common/system/autoinstall.py:

(AutoInstaller._download): Use curl(1) to download packages necessary for
webkitpy/thirdparty/autoinstalled since Python2's urllib2 module can result in unnecessary
errors which are not present when using curl(1).

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/autoinstall.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-22  Dean Johnson  <dean_johnson@apple.com>
+
+        Use curl to download packages for webkitpy autoinstaller
+        https://bugs.webkit.org/show_bug.cgi?id=197164
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/common/system/autoinstall.py:
+        (AutoInstaller._download): Use curl(1) to download packages necessary for
+        webkitpy/thirdparty/autoinstalled since Python2's urllib2 module can result in unnecessary
+        errors which are not present when using curl(1).
+
 2019-04-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py

@@ -47 +47 @@
 from glob import glob
 import urlparse
+import subprocess
 
 
@@ -419 +420 @@
 
         target_path = os.path.join(scratch_dir, target_filename)
-        with open(target_path, "wb") as stream:
-            self._download_to_stream(url, stream)
+
+        if os.name == 'posix':
+            try:
+                command = ['curl', url, '-L', '--output', target_path]
+                with open(os.devnull, 'w') as devnull:
+                    subprocess.check_call(command, stdout=devnull, stderr=devnull)
+            except subprocess.CalledProcessError as e:
+                _log.info('Error: Failed to download {} to {}. Command: {}'.format(url, target_path, command))
+                raise
+        else:  # Windows
+            with open(target_path, "wb") as stream:
+                self._download_to_stream(url, stream)
 
         if _CACHE_ENV_VAR in os.environ: