diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-08 16:11:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-08 16:13:33 +0300 |
| commit | 31a45666857b0b8a8b3a55ad0db5f6025711d9d4 (patch) | |
| tree | 7463b40f234ab7bb8ece13ad9db66b59e50989e4 /build_files/utils | |
| parent | df08fcebe8569a75342d67530d431bf112f49b39 (diff) | |
Fix "make update" error with old git versions, for the buildbot
Just skip convenience test that checks if a rebase/merge is in progress.
Diffstat (limited to 'build_files/utils')
| -rwxr-xr-x | build_files/utils/make_update.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index 3ecfa218432..48158d540c4 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -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): |