From e19aa807349cd29a4787ce3f0a256ea3cbfd502f Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Tue, 12 Dec 2017 05:14:24 +0800 Subject: intel-parallel-studio: restrict patch to versions > 2016 (#6523) Fixes #6522 Patch psxevars.sh and psxevars.csh only when year > 2016. pxevars.csh does not exist for versions before 2017. psxevars.sh does not appear to require this patch for versions before 2017. --- .../repos/builtin/packages/intel-parallel-studio/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index ff0315a42a..fefda18e18 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -435,15 +435,16 @@ class IntelParallelStudio(IntelPackage): @run_after('install') def fix_psxevars(self): - """Newer versions of Intel Parallel Studio have a bug in the + """Newer versions (>2016) of Intel Parallel Studio have a bug in the ``psxevars.sh`` script.""" bindir = glob.glob(join_path( self.prefix, 'parallel_studio*', 'bin'))[0] - filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), - os.path.join(bindir, 'psxevars.sh'), - os.path.join(bindir, 'psxevars.csh')) + if self.version[1] > 2016: + filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), + os.path.join(bindir, 'psxevars.sh'), + os.path.join(bindir, 'psxevars.csh')) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): if '+mpi' in self.spec: -- cgit v1.2.3-70-g09d2