[Bf-blender-cvs] [3a6217b4c85] codesign: Codesign: More tweaks for non-Blender bundles

[Sergey Sharybin]

Commit: 3a6217b4c85dec2aa0c17966143db20e6eab22be
Author: Sergey Sharybin
Date:   Wed Jan 8 16:38:13 2020 +0100
Branches: codesign
https://developer.blender.org/rB3a6217b4c85dec2aa0c17966143db20e6eab22be

Codesign: More tweaks for non-Blender bundles

- Allow spaces in bundle name
- More correct logic to get volume name (for the case when there is no
  '-' separator in the DMG name).

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

M	build_files/buildbot/codesign/macos_code_signer.py
M	build_files/buildbot/slave_bundle_dmg.py

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

diff --git a/build_files/buildbot/codesign/macos_code_signer.py b/build_files/buildbot/codesign/macos_code_signer.py
index 70f6ea06e10..8c9e730928b 100644
--- a/build_files/buildbot/codesign/macos_code_signer.py
+++ b/build_files/buildbot/codesign/macos_code_signer.py
@@ -271,7 +271,7 @@ class MacOSCodeSigner(BaseCodeSigner):
         Get bundle ID which will be used to notarize DMG
         """
         name = file.relative_filepath.name
-        app_name = name.split('-', 2)[0].lower()
+        app_name = name.split('-', 2)[0].lower().replace(' ', '_')
 
         # TODO(sergey): Consider using "alpha" for buildbot builds.
         return f'org.blenderfoundation.{app_name}.release'
diff --git a/build_files/buildbot/slave_bundle_dmg.py b/build_files/buildbot/slave_bundle_dmg.py
index 6fd74433ee7..11d2c3cb602 100755
--- a/build_files/buildbot/slave_bundle_dmg.py
+++ b/build_files/buildbot/slave_bundle_dmg.py
@@ -495,7 +495,7 @@ def get_volume_name_from_dmg_filepath(dmg_filepath: Path) -> str:
     Will use first part of the DMG file name prior to dash.
     """
 
-    tokens = dmg_filepath.name.split('-')
+    tokens = dmg_filepath.stem.split('-')
     words = tokens[0].split()
 
     return ' '.join(word.capitalize() for word in words)