Improve git_describe() fix 1 (#2635)

Add stderr=subprocess.STDOUT to catch error messages.
This commit is contained in:
Glenn Jocher authored and GitHub committed 2021-03-28 17:09:06 +02:00
1 parent 518c09578e
commit 2e95cf3d79
1 file changed
+2 -3
+2 -3
View File
@@ -55,10 +55,9 @@ def git_describe(path=Path(__file__).parent): # path must be a directory
# return human-readable git description, i.e. v5.0-5-g3e25f1e https://git-scm.com/docs/git-describe
s = f'git -C {path} describe --tags --long --always'
try:
r = subprocess.check_output(s, shell=True).decode()[:-1]
return '' if r.startswith('fatal: not a git repository') else r
return subprocess.check_output(s, shell=True, stderr=subprocess.STDOUT).decode()[:-1]
except subprocess.CalledProcessError as e:
return ''
return '' # not a git repository
def select_device(device='', batch_size=None):