pull in additional changes from 2.0 branch.

[monitor.git] / pcucontrol / models / BayTech.py

diff --git a/pcucontrol/models/BayTech.py b/pcucontrol/models/BayTech.py
index 065cc28..5883c4b 100644 (file)
--- a/pcucontrol/models/BayTech.py
+++ b/pcucontrol/models/BayTech.py
@@ -123,8 +123,13 @@ class BayTechCtrlC(PCUControl):
 
                ssh_options="-o StrictHostKeyChecking=no -o PasswordAuthentication=yes -o PubkeyAuthentication=no"
                s = pxssh.pxssh()
-               if not s.login(self.host, self.username, self.password, ssh_options):
-                       raise ExceptionPassword("Invalid Password")
+               try:
+                       if not s.login(self.host, self.username, self.password, ssh_options):
+                               raise ExceptionPassword("Invalid Password")
+               except pexpect.EOF:
+                       raise ExceptionNoTransport("No Connection Possible")
+                       
+                       
                # Otherwise, the login succeeded.
 
                # Send a ctrl-c to the remote process.