[Bf-blender-cvs] [b57a89f0625] blender-v2.81-release: Buildbot: don't add branch prefix when building release branches

[Brecht Van Lommel]

Commit: b57a89f06259eadee68c3b8e340dc244aa73ac9f
Author: Brecht Van Lommel
Date:   Fri Oct 11 13:45:16 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rBb57a89f06259eadee68c3b8e340dc244aa73ac9f

Buildbot: don't add branch prefix when building release branches

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

M	build_files/buildbot/buildbot_utils.py
M	build_files/buildbot/slave_pack.py

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

diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py
index 6891b91aa1e..eded6646671 100644
--- a/build_files/buildbot/buildbot_utils.py
+++ b/build_files/buildbot/buildbot_utils.py
@@ -20,6 +20,7 @@
 
 import argparse
 import os
+import re
 import subprocess
 import sys
 
@@ -27,6 +28,7 @@ class Builder:
     def __init__(self, name, branch):
         self.name = name
         self.branch = branch
+        self.is_release_branch = re.match("^blender-v(.*)-release$", branch) is not None
 
         # Buildbot runs from build/ directory
         self.blender_dir = os.path.abspath(os.path.join('..', 'blender.git'))
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 9e7a157eb99..5bef2b81739 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -32,8 +32,9 @@ def get_package_name(builder, platform=None):
     package_name = 'blender-' + info.full_version
     if platform:
       package_name += '-' + platform
-    if builder.branch != 'master' and info.is_development_build:
-        package_name = builder.branch + "-" + package_name
+    if not (builder.branch == 'master' or builder.is_release_branch):
+        if info.is_development_build:
+            package_name = builder.branch + "-" + package_name
 
     return package_name
 
@@ -47,6 +48,7 @@ def create_buildbot_upload_zip(builder, package_files):
     try:
         z = zipfile.ZipFile(buildbot_upload_zip, "w", compression=zipfile.ZIP_STORED)
         for filepath, filename in package_files:
+            print("Packaged", filename)
             z.write(filepath, arcname=filename)
         z.close()
     except Exception as ex: