zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

isolate util/gpg

Browse Source
This commit is contained in:
Gregory Becker 2024-02-14 13:16:03 -08:00
parent bc06e2bc17
commit 6e24ea55ea
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/util/gpg.py
View File

@ -10,7 +10,6 @@
import spack.util.error import spack.util.error
import spack.util.executable import spack.util.executable
import spack.version
#: Executable instance for "gpg", initialized lazily #: Executable instance for "gpg", initialized lazily
GPG = None GPG = None
@ -333,11 +332,11 @@ def _verify_exe_or_raise(exe):
raise SpackGPGError(msg) raise SpackGPGError(msg)
output = exe("--version", output=str) 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: if not match:
raise SpackGPGError('Could not determine "{0}" version'.format(exe.name)) 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) raise SpackGPGError(msg)