diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2020-10-21 21:35:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 21:35:02 +0200 |
| commit | c696518efda3ae5087d90325381f8e315b660add (patch) | |
| tree | f287e319458810ef2ea74d972867cef20c6262f6 /var | |
| parent | 2bb775496ed0ecddee1eb5b55d149f25a33fd8a2 (diff) | |
| download | spack-c696518efda3ae5087d90325381f8e315b660add.tar.gz spack-c696518efda3ae5087d90325381f8e315b660add.tar.bz2 spack-c696518efda3ae5087d90325381f8e315b660add.tar.xz spack-c696518efda3ae5087d90325381f8e315b660add.zip | |
Skip malformed spec strings when searching for externals (#19438)
fixes #19266
fzf search method has also been updated
Co-authored-by: Tom Scogland <tom.scogland@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/fzf/package.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/fzf/package.py b/var/spack/repos/builtin/packages/fzf/package.py index 46303cb0d5..cee38abad4 100644 --- a/var/spack/repos/builtin/packages/fzf/package.py +++ b/var/spack/repos/builtin/packages/fzf/package.py @@ -2,12 +2,10 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - import os +import re import shutil -from spack import * - class Fzf(MakefilePackage): """fzf is a general-purpose command-line fuzzy finder.""" @@ -37,7 +35,9 @@ class Fzf(MakefilePackage): @classmethod def determine_version(cls, exe): - return Executable(exe)('--version', output=str, error=str).rstrip() + candidate = Executable(exe)('--version', output=str, error=str) + match = re.match(r'(^[\d.]+)', candidate) + return match.group(1) if match else None @when('@:0.17.5') def patch(self): |