diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-09-20 13:40:51 +0300 |
|---|---|---|
| committer | Pablo Vazquez <pablo@blender.org> | 2021-09-22 16:54:11 +0300 |
| commit | 3107db97e211edc6649e442bb1228b613041f82b (patch) | |
| tree | 364c28a8d408a866a45672a4f65648817b13a68c /build_files/utils | |
| parent | 3ea201bfa6e8926fde1cb2d804439d22bc3bd913 (diff) | |
make_update: Fix case where a sub-module would not have required branch.
Issue revealed by rB546314fc9669 change, also error itself exited before
that commit.
Now we do accept git command to fail when trying to checkout the
specified branch from sub-modules, and only actually error in case the
fall-back branch (aka master) cannot be properly checked out.
Thanks fot Ray molenkamp (@LazyDodo) for report and initial patch
(D12560).
Diffstat (limited to 'build_files/utils')
| -rwxr-xr-x | build_files/utils/make_update.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index a6399790bc9..f653639ec6d 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -200,13 +200,14 @@ def submodules_update(args, release_version, branch): if msg: skip_msg += submodule_path + " skipped: " + msg + "\n" else: + # We are using `exit_on_error=False` here because sub-modules are allowed to not have requested branch, + # in which case falling back to default back-up branch is fine. if make_utils.git_branch(args.git_command) != submodule_branch: call([args.git_command, "fetch", "origin"]) - call([args.git_command, "checkout", submodule_branch]) - call([args.git_command, "pull", "--rebase", "origin", submodule_branch]) + call([args.git_command, "checkout", submodule_branch], exit_on_error=False) + call([args.git_command, "pull", "--rebase", "origin", submodule_branch], exit_on_error=False) # If we cannot find the specified branch for this submodule, fallback to default one (aka master). if make_utils.git_branch(args.git_command) != submodule_branch: - call([args.git_command, "fetch", "origin"]) call([args.git_command, "checkout", submodule_branch_fallback]) call([args.git_command, "pull", "--rebase", "origin", submodule_branch_fallback]) finally: |