[Bf-blender-cvs] [66b48ad8fb3] master: Fix git tag warning when running make update after recent changes

Brecht Van Lommel noreply at git.blender.org
Thu Jul 16 14:26:42 CEST 2020


Commit: 66b48ad8fb3bea4c0b643fe23fd25e70843067cd
Author: Brecht Van Lommel
Date:   Thu Jul 16 12:47:28 2020 +0200
Branches: master
https://developer.blender.org/rB66b48ad8fb3bea4c0b643fe23fd25e70843067cd

Fix git tag warning when running make update after recent changes

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

M	build_files/utils/make_utils.py

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

diff --git a/build_files/utils/make_utils.py b/build_files/utils/make_utils.py
index 9a3d25f4952..e94c8e3550a 100755
--- a/build_files/utils/make_utils.py
+++ b/build_files/utils/make_utils.py
@@ -48,7 +48,7 @@ def git_branch(git_command):
 def git_tag(git_command):
     # Get current tag name.
     try:
-        tag = subprocess.check_output([git_command, "describe", "--exact-match"])
+        tag = subprocess.check_output([git_command, "describe", "--exact-match"], stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:
         return None



More information about the Bf-blender-cvs mailing list