Merge pull request #45712 from bdrung/fix-version-decode

Decode git call output in Python 3
This commit is contained in:
Nicole Thomas 2018-01-27 21:03:20 -05:00 committed by GitHub
commit 7516bfbffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -512,6 +512,9 @@ def __discover_version(saltstack_version):
process = subprocess.Popen(
['git', 'describe', '--tags', '--match', 'v[0-9]*', '--always'], **kwargs)
out, err = process.communicate()
if six.PY3:
out = out.decode()
err = err.decode()
out = out.strip()
err = err.strip()