From 6e24ea55ea62726e7bcf6eceae469a1388e829bc Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Wed, 14 Feb 2024 13:16:03 -0800 Subject: [PATCH] isolate util/gpg --- lib/spack/spack/util/gpg.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/spack/spack/util/gpg.py b/lib/spack/spack/util/gpg.py index b0a2c353062..14e82f5d59e 100644 --- a/lib/spack/spack/util/gpg.py +++ b/lib/spack/spack/util/gpg.py @@ -10,7 +10,6 @@ import spack.util.error import spack.util.executable -import spack.version #: Executable instance for "gpg", initialized lazily GPG = None @@ -333,11 +332,11 @@ def _verify_exe_or_raise(exe): raise SpackGPGError(msg) output = exe("--version", output=str) - match = re.search(r"^gpg(conf)? \(GnuPG\) (.*)$", output, re.M) + match = re.search(r"^gpg(conf)? \(GnuPG\) (\d+).*$", output, re.M) if not match: raise SpackGPGError('Could not determine "{0}" version'.format(exe.name)) - if spack.version.Version(match.group(2)) < spack.version.Version("2"): + if int(match.group(2)) < 2: raise SpackGPGError(msg)