valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #31018 from twangboy/uname_fix

Browse Source 
Backport uname fix from #30951
This commit is contained in:
Mike Place 2016-02-09 10:05:24 -07:00
commit b2b5046652
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@ -61,7 +61,11 @@ BOOTSTRAP_SCRIPT_DISTRIBUTED_VERSION = os.environ.get(
# Store a reference to the executing platform
IS_WINDOWS_PLATFORM = sys.platform.startswith('win')
IS_SMARTOS_PLATFORM = os.uname()[0] == 'SunOS' and os.uname()[3].startswith('joyent_')
if IS_WINDOWS_PLATFORM:
IS_SMARTOS_PLATFORM = False
else:
# os.uname() not available on Windows.
IS_SMARTOS_PLATFORM = os.uname()[0] == 'SunOS' and os.uname()[3].startswith('joyent_')
# Store a reference wether if we're running under Python 3 and above
IS_PY3 = sys.version_info > (3,)