summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2019-03-27 12:24:14 +0000
committerAngelos Evripiotis <angelos.evripiotis@gmail.com>2019-04-11 13:58:33 +0000
commit3ec65d9b4a21d5e503b7edfe9e691aa4e9e6714f (patch)
tree343e4ca19953dfdb1bbdb6832a6c0dcd593c0821
parent16079b49f10dc561749a429842094e066a699f5f (diff)
downloadbuildstream-aevri/platform_uname.tar.gz
Use uname field names instead of indicesaevri/platform_uname
platform.uname() returns a namedtuple of "system, node, release, version, machine, and processor". Use these slightly clearer names instead of the magic numbers.
-rw-r--r--buildstream/_options/optionos.py2
-rw-r--r--buildstream/_platform/platform.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/_options/optionos.py b/buildstream/_options/optionos.py
index 501ad6046..2d46b70ba 100644
--- a/buildstream/_options/optionos.py
+++ b/buildstream/_options/optionos.py
@@ -32,7 +32,7 @@ class OptionOS(OptionEnum):
super(OptionOS, self).load(node, allow_default_definition=False)
def load_default_value(self, node):
- return platform.uname()[0]
+ return platform.uname().system
def resolve(self):
diff --git a/buildstream/_platform/platform.py b/buildstream/_platform/platform.py
index 4c637ffa5..dba60ddca 100644
--- a/buildstream/_platform/platform.py
+++ b/buildstream/_platform/platform.py
@@ -76,7 +76,7 @@ class Platform():
@staticmethod
def get_host_os():
- return platform.uname()[0]
+ return platform.uname().system
# canonicalize_arch():
#
@@ -125,7 +125,7 @@ class Platform():
@staticmethod
def get_host_arch():
# get the hardware identifier from uname
- uname_machine = platform.uname()[4]
+ uname_machine = platform.uname().machine
return Platform.canonicalize_arch(uname_machine)
##################################################################