diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-09-20 14:17:01 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-09-20 15:05:56 +0300 |
commit | da4796ebf7ea728dc81ff4b3c62410230520977a (patch) | |
tree | f0a453cf2de6866804b74c2798622466cc7f40fc /build_files/utils/make_utils.py | |
parent | fc4f82d2004c843691d81afff0f7abb38caace0a (diff) |
Build: change make update to not print errors regarding submodule branches
Instead of trying to checkout non-existent branches and getting confusing fatal
error prints, check if the branch exists first.
Ref D12560
Diffstat (limited to 'build_files/utils/make_utils.py')
-rwxr-xr-x | build_files/utils/make_utils.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/build_files/utils/make_utils.py b/build_files/utils/make_utils.py index db352ff7e16..9def0059ceb 100755 --- a/build_files/utils/make_utils.py +++ b/build_files/utils/make_utils.py @@ -8,14 +8,19 @@ import subprocess import sys -def call(cmd, exit_on_error=True): - print(" ".join(cmd)) +def call(cmd, exit_on_error=True, silent=False): + if not silent: + print(" ".join(cmd)) # Flush to ensure correct order output on Windows. sys.stdout.flush() sys.stderr.flush() - retcode = subprocess.call(cmd) + if silent: + retcode = subprocess.call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + else: + retcode = subprocess.call(cmd) + if exit_on_error and retcode != 0: sys.exit(retcode) return retcode @@ -38,6 +43,11 @@ def check_output(cmd, exit_on_error=True): return output.strip() +def git_branch_exists(git_command, branch): + return call([git_command, "rev-parse", "--verify", branch], exit_on_error=False, silent=True) == 0 or \ + call([git_command, "rev-parse", "--verify", "remotes/origin/" + branch], exit_on_error=False, silent=True) == 0 + + def git_branch(git_command): # Get current branch name. try: |