bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix "make update" error with old git versions, for the buildbot

Browse Source 
Just skip convenience test that checks if a rebase/merge is in progress.
This commit is contained in:
Brecht Van Lommel 2019-10-08 15:11:55 +02:00
parent df08fcebe8
commit 31a4566685
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/utils/make_update.py
View File

@ -106,9 +106,9 @@ def blender_update_skip(args):
sys.exit(1)
# Abort if a rebase is still progress.
rebase_merge = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-merge'])
rebase_apply = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-apply'])
merge_head = check_output([args.git_command, 'rev-parse', '--git-path', 'MERGE_HEAD'])
rebase_merge = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-merge'], exit_on_error=False)
rebase_apply = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-apply'], exit_on_error=False)
merge_head = check_output([args.git_command, 'rev-parse', '--git-path', 'MERGE_HEAD'], exit_on_error=False)
if os.path.exists(rebase_merge) or \
os.path.exists(rebase_apply) or \
os.path.exists(merge_head):