[Bf-blender-cvs] [cc93a66e71a] master: Buildbot: SPecial branch trickery for linux slaves

Sergey Sharybin noreply at git.blender.org
Mon Apr 3 15:07:15 CEST 2017


Commit: cc93a66e71a9de09cb41d4433be86e0f056d2b6f
Author: Sergey Sharybin
Date:   Mon Apr 3 15:04:16 2017 +0200
Branches: master
https://developer.blender.org/rBcc93a66e71a9de09cb41d4433be86e0f056d2b6f

Buildbot: SPecial branch trickery for linux slaves

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

M	build_files/buildbot/slave_pack.py

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

diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 33bf3745182..6929be85003 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -178,7 +178,8 @@ if builder.find('cmake') != -1:
                                                       blender_hash,
                                                       blender_glibc,
                                                       blender_arch)
-        if branch != '':
+        # NOTE: Blender 2.8 is already respected by blender_full_version.
+        if branch != '' and branch != 'blender2.8':
             package_name = branch + "-" + package_name
 
         upload_filename = package_name + ".tar.bz2"




More information about the Bf-blender-cvs mailing list