Need to consider blender-v* a release branch, not just blender-

This is because of blender-tiles branch we've got..
This commit is contained in:
Sergey Sharybin 2014-06-16 15:16:18 +06:00
parent 0125ae1eb2
commit 38d6841687
2 changed files with 2 additions and 2 deletions

View File

@ -85,7 +85,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
endif()
endif()
if(MY_WC_BRANCH MATCHES "^blender-")
if(MY_WC_BRANCH MATCHES "^blender-v")
set(MY_WC_BRANCH "master")
endif()

View File

@ -457,7 +457,7 @@ def buildinfo(lenv, build_type):
unpushed_log = os.popen('git log --oneline @{u}..').read().strip()
has_local_changes = unpushed_log != ''
if build_branch.startswith('blender-'):
if build_branch.startswith('blender-v'):
build_branch = 'master'
if has_local_changes: