Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
-rw-r--r--build_files/buildbot/slave_pack.py6
1 files changed, 4 insertions, 2 deletions
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: