diff options
| -rw-r--r-- | lib/spack/spack/spec.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/mysql/package.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 20e5c3ffa3..88184de30f 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -3128,9 +3128,7 @@ class Spec: except spack.error.UnsatisfiableSpecError as e: # Here, the DAG contains two instances of the same package - # with inconsistent constraints. Users cannot produce - # inconsistent specs like this on the command line: the - # parser doesn't allow it. Spack must be broken! + # with inconsistent constraints. raise InconsistentSpecError("Invalid Spec DAG: %s" % e.message) from e def index(self, deptype="all"): diff --git a/var/spack/repos/builtin/packages/mysql/package.py b/var/spack/repos/builtin/packages/mysql/package.py index f044e35440..1fee55fda9 100644 --- a/var/spack/repos/builtin/packages/mysql/package.py +++ b/var/spack/repos/builtin/packages/mysql/package.py @@ -191,5 +191,5 @@ class Mysql(CMakePackage): if int(cxxstd) > 14: env.append_flags("CXXFLAGS", "-Wno-error=register") - if "python" in self.spec.flat_dependencies() and self.spec.satisfies("@:7"): + if "python" in self.spec and self.spec.satisfies("@:7"): self._fix_dtrace_shebang(env) |