From b2ece3abba4371ca3362a3b9a2e67c0484c45a27 Mon Sep 17 00:00:00 2001 From: iarspider Date: Fri, 12 Mar 2021 18:52:07 +0100 Subject: Rivet: syntax fixes (#22225) --- var/spack/repos/builtin/packages/rivet/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py index 00dea83e64..12ccf1fea1 100644 --- a/var/spack/repos/builtin/packages/rivet/package.py +++ b/var/spack/repos/builtin/packages/rivet/package.py @@ -155,16 +155,15 @@ class Rivet(AutotoolsPackage): fjcontrib_home = self.spec['fjcontrib'].prefix env.prepend_path('LD_LIBRARY_PATH', fjcontrib_home.lib) - @when('@3.1.2:') def flag_handler(self, name, flags): - if name == 'cxxflags': + if self.spec.satisfies('@3.1.2:') and name == 'cxxflags': flags.append('-faligned-new') return (None, None, flags) return (flags, None, None) def configure_args(self): args = [] - if self.spec.variants['hepmc'] == '2': + if self.spec.variants['hepmc'].value == '2': args += ['--with-hepmc=' + self.spec['hepmc'].prefix] else: args += ['--with-hepmc3=' + self.spec['hepmc'].prefix] -- cgit v1.2.3-60-g2f50