From 3a33d45d6d1d54f8b86c6cfb4ea8f79b405f4f45 Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Mon, 22 Mar 2021 12:19:07 -0400 Subject: openssh: support spack external find (#22445) --- var/spack/repos/builtin/packages/openssh/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'var') 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 -- cgit v1.2.3-70-g09d2