diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-20 12:03:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-20 12:03:54 +0300 |
| commit | 6f51df5384f1a78ea0359459f410a9724d7f2e80 (patch) | |
| tree | 14bbdbfd5fe805a34c3389c5df25651bf8f5fa4b /build_files | |
| parent | 6de12b1b43f846f786abc903b992d9493900f76f (diff) | |
SCons: Attempt to deal with branches without upstream configured
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 060904e7cd7..dbe1cafc14f 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -441,7 +441,7 @@ def buildinfo(lenv, build_type): no_upstream = False try : - build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']).strip() + build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}'], stderr=subprocess.STDOUT).strip() except subprocess.CalledProcessError: # assume branch has no upstream configured build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip() |