summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Becker <becker33@llnl.gov>2024-01-09 11:40:06 -0800
committerGitHub <noreply@github.com>2024-01-09 11:40:06 -0800
commitba547a7f51e75bc56bc7af0f8eea5079a30d655e (patch)
tree1e21bf5679951d8943d91bfce8214349a9583dac
parentbf3990039009d65213beaebea50054276ca93a16 (diff)
downloadspack-ba547a7f51e75bc56bc7af0f8eea5079a30d655e.tar.gz
spack-ba547a7f51e75bc56bc7af0f8eea5079a30d655e.tar.bz2
spack-ba547a7f51e75bc56bc7af0f8eea5079a30d655e.tar.xz
spack-ba547a7f51e75bc56bc7af0f8eea5079a30d655e.zip
fix gpg version parsing for macos (#41995)
-rw-r--r--lib/spack/spack/util/gpg.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/spack/spack/util/gpg.py b/lib/spack/spack/util/gpg.py
index f29b4b5c28..beae7f707b 100644
--- a/lib/spack/spack/util/gpg.py
+++ b/lib/spack/spack/util/gpg.py
@@ -334,7 +334,7 @@ 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(?:/MacGPG2)?\) (.*)$", output, re.M)
if not match:
raise SpackGPGError('Could not determine "{0}" version'.format(exe.name))