diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-09 15:41:34 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-09 16:09:53 +0300 |
commit | 7e7b2051371d8efae33b222ff667eed862eee3af (patch) | |
tree | e1d94656845b3530238ab8fe4ca66bbbe601a0d4 /build_files/utils/make_utils.py | |
parent | 6c9178b183f5267e07a6c55497b6d496e468a709 (diff) |
Build: prepare "make update" to work for new release cycle branching
Checking out release branches in submodules, and printing some more
informative messages when that fails.
Diffstat (limited to 'build_files/utils/make_utils.py')
-rwxr-xr-x | build_files/utils/make_utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/utils/make_utils.py b/build_files/utils/make_utils.py index 5fedd792149..7b21bc607a4 100755 --- a/build_files/utils/make_utils.py +++ b/build_files/utils/make_utils.py @@ -35,7 +35,7 @@ def check_output(cmd, exit_on_error=True): return output.strip() -def git_branch_release_version(git_command): +def git_branch(git_command): # Test if we are building a specific release version. try: branch = subprocess.check_output([git_command, "rev-parse", "--abbrev-ref", "HEAD"]) @@ -43,7 +43,9 @@ def git_branch_release_version(git_command): sys.stderr.write("Failed to get Blender git branch\n") sys.exit(1) - branch = branch.strip().decode('utf8') + return branch.strip().decode('utf8') + +def git_branch_release_version(branch): release_version = re.search("^blender-v(.*)-release$", branch) if release_version: release_version = release_version.group(1) |