[Bf-blender-cvs] [ae433393afd] blender-v2.82-release: Codesign: Fix script for Windows

Sergey Sharybin noreply at git.blender.org
Tue Feb 4 10:25:25 CET 2020


Commit: ae433393afda7e65462ccece9a67c744910bd9e3
Author: Sergey Sharybin
Date:   Tue Feb 4 10:24:59 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBae433393afda7e65462ccece9a67c744910bd9e3

Codesign: Fix script for Windows

Apparently, there is no os.sync() on Windows.

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

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 0574c964612..d417d4560d6 100644
--- a/build_files/buildbot/codesign/archive_with_indicator.py
+++ b/build_files/buildbot/codesign/archive_with_indicator.py
@@ -21,7 +21,7 @@
 import os
 from pathlib import Path
 
-from codesign.util import ensure_file_does_not_exist_or_die
+import codesign.util as util
 
 
 class ArchiveWithIndicator:
@@ -85,16 +85,17 @@ class ArchiveWithIndicator:
         assert not self.is_ready()
         # Try the best to make sure everything is synced to the file system,
         # to avoid any possibility of stamp appearing on a network share prior to
-        # an actual filr.
-        os.sync()
+        # an actual file.
+        if util.get_current_platform() != util.Platform.WINDOWS:
+            os.sync()
         self.ready_indicator_filepath.touch()
 
     def clean(self) -> None:
         """
         Remove both archive and the ready indication file.
         """
-        ensure_file_does_not_exist_or_die(self.ready_indicator_filepath)
-        ensure_file_does_not_exist_or_die(self.archive_filepath)
+        util.ensure_file_does_not_exist_or_die(self.ready_indicator_filepath)
+        util.ensure_file_does_not_exist_or_die(self.archive_filepath)
 
     def is_fully_absent(self) -> bool:
         """



More information about the Bf-blender-cvs mailing list