From 2fc9ac4036eb017164cc6ac6f19e50dab5008759 Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33@llnl.gov>
Date: Wed, 15 Jun 2016 16:39:39 -0700
Subject: Two minor fixes

---
 lib/spack/spack/compilers/__init__.py | 10 +++++-----
 lib/spack/spack/yaml_version_check.py |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py
index ea79f655b0..c76dd252d0 100644
--- a/lib/spack/spack/compilers/__init__.py
+++ b/lib/spack/spack/compilers/__init__.py
@@ -74,7 +74,7 @@ def _to_dict(compiler):
     d['spec'] = str(compiler.spec)
     d['paths'] = dict( (attr, getattr(compiler, attr, None)) for attr in _path_instance_vars )
     d['operating_system'] = compiler.operating_system.to_dict()
-    d['modules'] = compiler.modules
+    d['modules'] = compiler.modules if compiler.modules else []
 
     if not compiler.alias:
         yaml_text = yaml.dump(
@@ -141,11 +141,11 @@ def remove_compiler_from_config(compiler_spec, scope=None):
       - scope:          configuration scope to modify.
     """
     compiler_config = get_compiler_config(scope)
-    matches = [(a,c) for (a,c) in compiler_config.items() if c['spec'] == compiler_spec]    
+    matches = [(a,c) for (a,c) in compiler_config.items() if c['spec'] == compiler_spec]
     if len(matches) == 1:
         del compiler_config[matches[0][0]]
     else:
-        CompilerSpecInsufficientlySpecificError(compiler_spec)        
+        CompilerSpecInsufficientlySpecificError(compiler_spec)
 
     spack.config.update_config('compilers', compiler_config, scope)
 
@@ -234,7 +234,7 @@ def compilers_for_spec(compiler_spec, scope=None):
                 continue
             items = cmp
             alias = aka
-        
+
             if not ('paths' in items and all(n in items['paths'] for n in _path_instance_vars)):
                 raise InvalidCompilerConfigurationError(cspec)
 
@@ -309,7 +309,7 @@ def all_os_classes():
     this platform
     """
     classes = []
-    
+
     platform = spack.architecture.sys_type()
     for os_class in platform.operating_sys.values():
         classes.append(os_class)
diff --git a/lib/spack/spack/yaml_version_check.py b/lib/spack/spack/yaml_version_check.py
index 7e7bae4edf..2d3d78ed39 100644
--- a/lib/spack/spack/yaml_version_check.py
+++ b/lib/spack/spack/yaml_version_check.py
@@ -46,10 +46,10 @@ def check_compiler_yaml_version():
         if data:
             compilers = data['compilers'].items()
             if len(compilers) > 0:
-                if 'operating_system' not in compilers[0][1]:
+                if (not isinstance(compilers, list)) or 'operating_system' not in compilers[0][1]:
                     new_file = os.path.join(scope.path, '_old_compilers.yaml')
-                    tty.warn('%s in out of date compilers format. ' 
+                    tty.warn('%s in out of date compilers format. '
                              'Moved to %s. Spack automatically generate '
-                             'a compilers config file ' 
+                             'a compilers config file '
                              % (file_name, new_file))
                     os.rename(file_name, new_file)
-- 
cgit v1.2.3-60-g2f50