[Bf-blender-cvs] [6c90bfe09e2] blender-v2.82-release: Codesign: Attempt to make macOS codesign more reliable

Sergey Sharybin noreply at git.blender.org
Tue Mar 10 10:26:14 CET 2020


Commit: 6c90bfe09e2b7c9f1c9e3bbf5c1b4544b672e5c8
Author: Sergey Sharybin
Date:   Wed Feb 12 18:57:07 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB6c90bfe09e2b7c9f1c9e3bbf5c1b4544b672e5c8

Codesign: Attempt to make macOS codesign more reliable

Is still sometimes .ready file appears prior to an actual archive.

===================================================================

M	build_files/buildbot/codesign/archive_with_indicator.py

===================================================================

diff --git a/build_files/buildbot/codesign/archive_with_indicator.py b/build_files/buildbot/codesign/archive_with_indicator.py
index d417d4560d6..ad3fe1c6ac7 100644
--- a/build_files/buildbot/codesign/archive_with_indicator.py
+++ b/build_files/buildbot/codesign/archive_with_indicator.py
@@ -72,7 +72,15 @@ class ArchiveWithIndicator:
 
     def is_ready(self) -> bool:
         """Check whether the archive is ready for access."""
-        return self.ready_indicator_filepath.exists()
+        if not self.ready_indicator_filepath.exists():
+            return False
+        # Sometimes on macOS indicator file appears prior to the actual archive
+        # despite the order of creation and os.sync() used in tag_ready().
+        # So consider archive not ready if there is an indicator without an
+        # actual archive.
+        if not self.archive_filepath.exists():
+            return False
+        return True
 
     def tag_ready(self) -> None:
         """



More information about the Bf-blender-cvs mailing list