[Bf-blender-cvs] [c9f63037bc7] codesign: Codesign: Correct appplication bundles files collection
Sergey Sharybin
noreply at git.blender.org
Wed Jan 8 19:54:41 CET 2020
Commit: c9f63037bc7bea8bbfcb2208efbb2dee9c7cf1fe
Author: Sergey Sharybin
Date: Wed Jan 8 16:48:39 2020 +0100
Branches: codesign
https://developer.blender.org/rBc9f63037bc7bea8bbfcb2208efbb2dee9c7cf1fe
Codesign: Correct appplication bundles files collection
Made it so it works from mounted DMG directory.
===================================================================
M build_files/buildbot/codesign/macos_code_signer.py
===================================================================
diff --git a/build_files/buildbot/codesign/macos_code_signer.py b/build_files/buildbot/codesign/macos_code_signer.py
index 8c9e730928b..afa56d5466d 100644
--- a/build_files/buildbot/codesign/macos_code_signer.py
+++ b/build_files/buildbot/codesign/macos_code_signer.py
@@ -134,8 +134,18 @@ class MacOSCodeSigner(BaseCodeSigner):
# needed to do valid signature of bundle.
if path.name.endswith('.app'):
return AbsoluteAndRelativeFileName.recursively_from_directory(path)
- if path.name.endswith('.dmg') and path.is_dir():
- return AbsoluteAndRelativeFileName.recursively_from_directory(path)
+ if path.is_dir():
+ files = []
+ for child in path.iterdir():
+ if child.name.endswith('.app'):
+ current_files = AbsoluteAndRelativeFileName.recursively_from_directory(
+ child)
+ else:
+ current_files = super().collect_files_to_sign(child)
+ for current_file in current_files:
+ files.append(AbsoluteAndRelativeFileName(
+ path, current_file.absolute_filepath))
+ return files
return super().collect_files_to_sign(path)
############################################################################
More information about the Bf-blender-cvs
mailing list