Merge pull request #945 from dbcli/RW/unreached-exception

make FileNotFound exception reachable

2 files changed, 9 insertions, 5 deletions

diff --git a/changelog.md b/changelog.md
index 3df6b86..c80c859 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
-TODO
-===
+TBD
+=======
+
+Bug Fixes:
+----------
+* Allow `FileNotFound` exception for SSH config files.
 
 Features:
 ---------
diff --git a/mycli/main.py b/mycli/main.py
index 210e3d9..4069ebe 100755
--- a/mycli/main.py
+++ b/mycli/main.py
@@ -1350,6 +1350,9 @@ def read_ssh_config(ssh_config_path):
     try:
         with open(ssh_config_path) as f:
             ssh_config.parse(f)
+    except FileNotFoundError as e:
+        click.secho(str(e), err=True, fg='red')
+        sys.exit(1)
     # Paramiko prior to version 2.7 raises Exception on parse errors.
     # In 2.7 it has become paramiko.ssh_exception.SSHException,
     # but let's catch everything for compatibility
@@ -1359,9 +1362,6 @@ def read_ssh_config(ssh_config_path):
             err=True, fg='red'
         )
         sys.exit(1)
-    except FileNotFoundError as e:
-        click.secho(str(e), err=True, fg='red')
-        sys.exit(1)
     else:
         return ssh_config