1 files changed, 9 insertions, 1 deletions
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:
         """