[Bf-blender-cvs] [31a45666857] master: Fix "make update" error with old git versions, for the buildbot

[Brecht Van Lommel]

Commit: 31a45666857b0b8a8b3a55ad0db5f6025711d9d4
Author: Brecht Van Lommel
Date:   Tue Oct 8 15:11:55 2019 +0200
Branches: master
https://developer.blender.org/rB31a45666857b0b8a8b3a55ad0db5f6025711d9d4

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

Just skip convenience test that checks if a rebase/merge is in progress.

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

M	build_files/utils/make_update.py

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

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):