diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2021-03-22 12:19:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 10:19:07 -0600 |
| commit | 3a33d45d6d1d54f8b86c6cfb4ea8f79b405f4f45 (patch) | |
| tree | 18066a653c3bbd62dcf971850425465d0edfd741 /var | |
| parent | 20fc160f21a7958cddd1b16ab9a4408613317fce (diff) | |
| download | spack-3a33d45d6d1d54f8b86c6cfb4ea8f79b405f4f45.tar.gz spack-3a33d45d6d1d54f8b86c6cfb4ea8f79b405f4f45.tar.bz2 spack-3a33d45d6d1d54f8b86c6cfb4ea8f79b405f4f45.tar.xz spack-3a33d45d6d1d54f8b86c6cfb4ea8f79b405f4f45.zip | |
openssh: support spack external find (#22445)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openssh/package.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openssh/package.py b/var/spack/repos/builtin/packages/openssh/package.py index cfd2bfb866..715f8381c4 100644 --- a/var/spack/repos/builtin/packages/openssh/package.py +++ b/var/spack/repos/builtin/packages/openssh/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * +import re class Openssh(AutotoolsPackage): @@ -40,6 +41,16 @@ class Openssh(AutotoolsPackage): depends_on('ncurses') depends_on('zlib') + # Note: some server apps have "ssh" in the name, so require the exact + # command 'ssh' + executables = ['^ssh$', '^rsh$'] + + @classmethod + def determine_version(cls, exe): + output = Executable(exe)('-V', output=str, error=str).rstrip() + match = re.search(r'OpenSSH_([^, ]+)', output) + return match.group(1) if match else None + def configure_args(self): # OpenSSH's privilege separation path defaults to /var/empty. At # least newer versions want to create the directory during the |