diff --git a/tsshbatch.py b/tsshbatch.py index 627f02c..6d31f18 100755 --- a/tsshbatch.py +++ b/tsshbatch.py @@ -17,7 +17,7 @@ PROGNAME = "tsshbatch.py" BASENAME = PROGNAME.split(".py")[0] PROGENV = BASENAME.upper() -RCSID = "$Id: tsshbatch.py,v 1.134 2012/01/05 18:37:43 tundra Exp $" +RCSID = "$Id: tsshbatch.py,v 1.135 2013/02/22 18:23:35 tundra Exp $" VERSION = RCSID.split()[2] CPRT = "(c)" @@ -89,7 +89,7 @@ eBADFILE = "Cannot open '%s'!" eBADSUDO = "sudo Failed, Check Password Or Command! sudo Error Report: %s" eFEWARGS = "Too few command line arguments!" -eNOCONNECT = "Cannot Connect! (Name/Address Bad? Destination Unreachable?)" +eNOCONNECT = "Cannot Connect! (%s)" eNOLOGIN = "Cannot Login! (Login/Password Bad?)" @@ -200,7 +200,7 @@ # Everything else is some kind of connection problem except: - PrintReport([host, FAILURE, eNOCONNECT], HANDLER=PrintStderr) + PrintReport([host, FAILURE, eNOCONNECT % sys.exc_info()[1]], HANDLER=PrintStderr) ssh.close()