summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMario Melara <maamelara@gmail.com>2016-06-07 14:15:28 -0700
committerMario Melara <maamelara@gmail.com>2016-06-07 14:15:28 -0700
commit5715799d4ee1c39d11106bb78a034e6affac474c (patch)
treefc63caad92fbe20704a8197859dcdc422a5ab9b5 /lib
parent4925be0bc4b63571eb9a9cb63e65409bebcc2c66 (diff)
downloadspack-5715799d4ee1c39d11106bb78a034e6affac474c.tar.gz
spack-5715799d4ee1c39d11106bb78a034e6affac474c.tar.bz2
spack-5715799d4ee1c39d11106bb78a034e6affac474c.tar.xz
spack-5715799d4ee1c39d11106bb78a034e6affac474c.zip
Added to_dict back into operating system
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/architecture.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py
index 818731cbf8..1f25bc14ea 100644
--- a/lib/spack/spack/architecture.py
+++ b/lib/spack/spack/architecture.py
@@ -195,6 +195,7 @@ class Platform(object):
name = self.back_os
return self.operating_sys.get(name, None)
+
@classmethod
def detect(self):
@@ -333,6 +334,12 @@ class OperatingSystem(object):
return list(compilers.values())
+ def to_dict(self):
+ d = {}
+ d['name'] = self.name
+ d['version'] = self.version
+
+ return d
@key_ordering
class Arch(object):
@@ -410,7 +417,8 @@ def _operating_system_from_dict(os_name, platform=None):
"""
if not platform:
platform = sys_type()
- if isinstance(os_name, spack.util.spack_yaml.syaml_dict):
+ if isinstance(os_name, spack.util.spack_yaml.syaml_dict) or \
+ isinstance(os_name, dict):
name = os_name['name']
version = os_name['version']
return platform.operating_system(name+version)