]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-45055: Add retry when downloading externals on Windows (GH-28399)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 20 Sep 2021 14:59:15 +0000 (07:59 -0700)
committerGitHub <noreply@github.com>
Mon, 20 Sep 2021 14:59:15 +0000 (07:59 -0700)
Co-authored-by: Ɓukasz Langa <lukasz@langa.pl>
(cherry picked from commit ef9e22b253253615098d22cb49141a2a1024ee3c)

Co-authored-by: Steve Dower <steve.dower@python.org>
PCbuild/get_external.py

index a682d3849f14c6901ffc6331d06259a9c4cd1525..4ecc8925349c930e10a13aac142e2143bba4a60d 100755 (executable)
@@ -3,6 +3,8 @@
 import argparse
 import os
 import pathlib
+import sys
+import time
 import zipfile
 from urllib.request import urlretrieve
 
@@ -53,7 +55,22 @@ def main():
         verbose=args.verbose,
     )
     final_name = args.externals_dir / args.tag
-    extract_zip(args.externals_dir, zip_path).replace(final_name)
+    extracted = extract_zip(args.externals_dir, zip_path)
+    for wait in [1, 2, 3, 5, 8, 0]:
+        try:
+            extracted.replace(final_name)
+            break
+        except PermissionError as ex:
+            retry = f" Retrying in {wait}s..." if wait else ""
+            print(f"Encountered permission error '{ex}'.{retry}", file=sys.stderr)
+            time.sleep(wait)
+    else:
+        print(
+            f"ERROR: Failed to extract {final_name}.",
+            "You may need to restart your build",
+            file=sys.stderr,
+        )
+        sys.exit(1)
 
 
 if __name__ == '__main__':