[Bf-blender-cvs] [84eeff0] master: Buildbot: Fix for branch detection from the file name

Sergey Sharybin noreply at git.blender.org
Wed Oct 15 12:07:24 CEST 2014


Commit: 84eeff034805f3b13d0cb2f5f52d4edab5aa964c
Author: Sergey Sharybin
Date:   Wed Oct 15 16:06:48 2014 +0600
Branches: master
https://developer.blender.org/rB84eeff034805f3b13d0cb2f5f52d4edab5aa964c

Buildbot: Fix for branch detection from the file name

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

M	build_files/buildbot/master_unpack.py

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

diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index 651a68b..efcc563 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -71,14 +71,14 @@ def get_branch(filename):
     branch = ""
 
     for token in tokens:
+        if token == "blender":
+            return branch
+
         if branch == "":
             branch = token
         else:
             branch = branch + "-" + token
 
-        if token == "blender":
-            return branch
-
     return ""
 
 # get filename




More information about the Bf-blender-cvs mailing list