Fix more flake issues caused by last changes.

var/spack/repos/builtin/packages/cbtf/package.py

@@ -42,6 +42,7 @@
 
 from spack import *
 
+
 class Cbtf(CMakePackage):
     """CBTF project contains the base code for CBTF that supports creating
        components, component networks and the support to connect these

var/spack/repos/builtin/packages/openspeedshop/package.py

@@ -173,9 +173,9 @@ def cmake_args(self):
                 self.set_defaultbase_cmakeOptions(spec, cmake_args)
 
                 cmake_args.extend(
-                   ['-DCMAKE_CXX_FLAGS=%s'  % compile_flags,
-                    '-DCMAKE_C_FLAGS=%s'    % compile_flags,
-                    '-DINSTRUMENTOR=%s'
+                    ['-DCMAKE_CXX_FLAGS=%s'  % compile_flags,
+                     '-DCMAKE_C_FLAGS=%s'    % compile_flags,
+                     '-DINSTRUMENTOR=%s'
                         % instrumentor_setting,
                      '-DLIBMONITOR_DIR=%s'
                         % spec['libmonitor'].prefix,