X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=pcucontrol%2Fmodels%2FDRAC.py;h=e3172b6246dcf35979fbb99173ddea212b012086;hb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;hp=e7c030a23f20d8c26d6091a3da2193846f489bb7;hpb=c678c008f0c3a10947b38880e52005a856e1b122;p=monitor.git

diff --git a/pcucontrol/models/DRAC.py b/pcucontrol/models/DRAC.py
index e7c030a..e3172b6 100644
--- a/pcucontrol/models/DRAC.py
+++ b/pcucontrol/models/DRAC.py
@@ -12,11 +12,14 @@ class DRAC(PCUControl):
 		            "-o PasswordAuthentication=yes "+\
 					"-o PubkeyAuthentication=no"
 		s = pxssh.pxssh()
-		if not s.login(self.host, self.username, self.password, ssh_options,
+		try:
+			if not s.login(self.host, self.username, self.password, ssh_options,
 						original_prompts="Dell", login_timeout=Transport.TELNET_TIMEOUT):
-			raise ExceptionPassword("Invalid Password")
-
-		print "logging in..."
+				raise ExceptionPassword("Invalid Password")
+		except pexpect.EOF:
+			raise ExceptionPrompt("Disconnect before login prompt")
+			
+		print "logging in... %s" % self.host
 		s.send("\r\n\r\n")
 		try:
 			# Testing Reboot ?
@@ -148,11 +151,9 @@ def racadm_reboot(host, username, password, port, dryrun):
 
 		print "RUNCMD: %s" % output
 		if verbose:
-			logger.debug(output)
+			print output
 		return 0
 
 	except Exception, err:
-		logger.debug("runcmd raised exception %s" % err)
-		if verbose:
-			logger.debug(err)
-		return err
+		print "runcmd raised exception %s" % err
+		return str(err)