From 8058aecd2a5049ba86423ec5bcd3712d4e25506b Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 20 Apr 2021 19:55:29 +0200 Subject: [PATCH] lammps: fix typo in variant name (#23085) In two conflicts we used +adios instead of +user-adios --- var/spack/repos/builtin/packages/lammps/package.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index a3c76c33501..455e54b86ce 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -2,7 +2,6 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - from spack import * import datetime as dt @@ -149,11 +148,11 @@ def url_for_version(self, version): msg='+user-reaction only supported for version 20200505 and later') conflicts('+mliap', when='~snap') conflicts( - '+adios +mpi', when='^adios2~mpi', - msg='With +adios, mpi setting for adios2 and lammps must be the same') + '+user-adios +mpi', when='^adios2~mpi', + msg='With +user-adios, mpi setting for adios2 and lammps must be the same') conflicts( - '+adios ~mpi', when='^adios2+mpi', - msg='With +adios, mpi setting for adios2 and lammps must be the same') + '+user-adios ~mpi', when='^adios2+mpi', + msg='With +user-adios, mpi setting for adios2 and lammps must be the same') patch("lib.patch", when="@20170901") patch("660.patch", when="@20170922")