From 065e3d7c0d3bfe6fd141391c26c6c0df8c3bb316 Mon Sep 17 00:00:00 2001 From: scheibelp Date: Thu, 8 Dec 2016 11:41:34 -0800 Subject: Revert to-string for CNL operating system (#2526) --- lib/spack/spack/operating_systems/cnl.py | 2 +- lib/spack/spack/test/mock_packages_test.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index fa5394ce66..78807865b3 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -22,7 +22,7 @@ class Cnl(OperatingSystem): super(Cnl, self).__init__(name, version) def __str__(self): - return self.name + self.version + return self.name def find_compilers(self, *paths): types = spack.compilers.all_compiler_types() diff --git a/lib/spack/spack/test/mock_packages_test.py b/lib/spack/spack/test/mock_packages_test.py index a1919cd437..eab96165e0 100644 --- a/lib/spack/spack/test/mock_packages_test.py +++ b/lib/spack/spack/test/mock_packages_test.py @@ -66,7 +66,7 @@ compilers: modules: 'None' - compiler: spec: clang@3.3 - operating_system: CNL10 + operating_system: CNL paths: cc: /path/to/clang cxx: /path/to/clang++ @@ -97,7 +97,7 @@ compilers: cxx: /path/to/g++ f77: /path/to/gfortran fc: /path/to/gfortran - operating_system: CNL10 + operating_system: CNL spec: gcc@4.5.0 modules: 'None' - compiler: -- cgit v1.2.3-60-g2f50