valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip and stringify the return for the osarch

Browse Source
This commit is contained in:
Bo Maryniuk 2018-10-08 13:00:16 +02:00
parent a2483714f7
commit 70d3de0218
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/utils/pkg/rpm.py
View File

@ -9,6 +9,7 @@ import collections
import datetime
import logging
import subprocess
from salt.utils.stringutils import to_str
# Import 3rd-party libs
from salt.ext import six
@ -47,7 +48,7 @@ def get_osarch():
close_fds=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()[0]
return ret or 'unknown'
return to_str(ret).strip() or 'unknown'
def check_32(arch, osarch=None):