summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-04-20 19:55:29 +0200
committerGitHub <noreply@github.com>2021-04-20 11:55:29 -0600
commit8058aecd2a5049ba86423ec5bcd3712d4e25506b (patch)
tree14eaff5e506cb9e39615b04b173b34996f8416bf /var
parent5461411f212e60ff900a8c3ad99b11b5c0849270 (diff)
downloadspack-8058aecd2a5049ba86423ec5bcd3712d4e25506b.tar.gz
spack-8058aecd2a5049ba86423ec5bcd3712d4e25506b.tar.bz2
spack-8058aecd2a5049ba86423ec5bcd3712d4e25506b.tar.xz
spack-8058aecd2a5049ba86423ec5bcd3712d4e25506b.zip
lammps: fix typo in variant name (#23085)
In two conflicts we used +adios instead of +user-adios
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/lammps/package.py9
1 files 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 a3c76c3350..455e54b86c 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 @@ class Lammps(CMakePackage, CudaPackage):
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")