Changeset 269988 in webkit

Timestamp:

Nov 18, 2020 2:41:41 PM (3 years ago)

Author:

Matt Lewis

Message:

Big Sur testers failing to download build products
​https://bugs.webkit.org/show_bug.cgi?id=219095

Reviewed by Aakash Jain.

Fixing the url parsing to deal with special characters. Also
reworking the imports to help with transition to python3.

• CISupport/download-built-product:

(main):

Location:

trunk/Tools

Files:

• CISupport/download-built-product (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/download-built-product

@@ -1 +1 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2009 Apple Inc.  All rights reserved.
+# Copyright (C) 2009, 2020 Apple Inc.  All rights reserved.
 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
@@ -9 +9 @@
 #
 # 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer. 
+#     notice, this list of conditions and the following disclaimer.
 # 2.  Redistributions in binary form must reproduce the above copyright
 #     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution. 
+#     documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
@@ -30 +30 @@
 import subprocess
 import sys
-import urllib
+
+if sys.version_info > (3, 0):
+    from urllib.request import urlretrieve as urllib_urlretrieve
+    from urllib.parse import quote as urllib_quote
+else:
+    from urllib import quote as urllib_quote
+    from urllib import urlretrieve as urllib_urlretrieve
 
 
@@ -47 +53 @@
 
     if sys.platform == 'win32':  # curl is not availble on Windows (outside of cygwin)
-        urllib.urlretrieve(url, archivePath)
+        urllib_urlretrieve(url, archivePath)
         return 0
 
-    return subprocess.call(["curl", "--fail", "--output", archivePath, url])
+    return subprocess.call(["curl", "--fail", "--output", archivePath, urllib_quote(url, safe=':/')])
 
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-18  Matt Lewis  <jlewis3@apple.com>
+
+        Big Sur testers failing to download build products
+        https://bugs.webkit.org/show_bug.cgi?id=219095
+
+        Reviewed by Aakash Jain.
+
+        Fixing the url parsing to deal with special characters. Also
+        reworking the imports to help with transition to python3.
+        
+        * CISupport/download-built-product:
+        (main):
+
 2020-11-18  Chris Dumez  <cdumez@apple.com>