[Bf-blender-cvs] [2b35ee3ea2e] blender-v2.81-release: Fix issue in "make update" checking out submodule branch on buildbot

Brecht Van Lommel noreply at git.blender.org
Fri Oct 11 13:11:31 CEST 2019


Commit: 2b35ee3ea2ef5773e58a9486a281b4747d85a399
Author: Brecht Van Lommel
Date:   Fri Oct 11 13:11:10 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rB2b35ee3ea2ef5773e58a9486a281b4747d85a399

Fix issue in "make update" checking out submodule branch on buildbot

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

M	build_files/utils/make_update.py

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

diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py
index 3e91a43afd3..f845515bb3b 100755
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -181,6 +181,7 @@ def submodules_update(args, release_version, branch):
                 skip_msg += submodule_path + " skipped: "  + msg + "\n"
             else:
                 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])
         finally:



More information about the Bf-blender-cvs mailing list