mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #45712 from bdrung/fix-version-decode
Decode git call output in Python 3
This commit is contained in:
commit
7516bfbffe
1 changed files with 3 additions and 0 deletions
|
@ -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()
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue