summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2021-10-26 12:12:54 -0400
committerMike Frysinger <vapier@google.com>2021-10-26 16:18:45 +0000
commit282d0cae8913e9d20f526e7fb2633bb4e2a21fbf (patch)
tree8b5b359a95fc4e0e203341fa1a762452f90d1d1a
parent03ff276cd70e78639232d2e878d972f15ebcd461 (diff)
downloadgit-repo-282d0cae8913e9d20f526e7fb2633bb4e2a21fbf.tar.gz
ssh: handle FileNotFoundError errors
If ssh isn't installed, it throws a distinct error we have to catch. Bug: https://crbug.com/gerrit/15196 Change-Id: I0660e842c304ce7575f5cb100894d05fd65f9454 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/322055 Reviewed-by: Jack Neus <jackneus@google.com> Tested-by: Mike Frysinger <vapier@google.com>
-rw-r--r--ssh.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ssh.py b/ssh.py
index 0ae8d120..450383dc 100644
--- a/ssh.py
+++ b/ssh.py
@@ -52,6 +52,9 @@ def version():
52 """return ssh version as a tuple""" 52 """return ssh version as a tuple"""
53 try: 53 try:
54 return _parse_ssh_version() 54 return _parse_ssh_version()
55 except FileNotFoundError:
56 print('fatal: ssh not installed', file=sys.stderr)
57 sys.exit(1)
55 except subprocess.CalledProcessError: 58 except subprocess.CalledProcessError:
56 print('fatal: unable to detect ssh version', file=sys.stderr) 59 print('fatal: unable to detect ssh version', file=sys.stderr)
57 sys.exit(1) 60 sys.exit(1)