summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-03-10 04:42:11 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2011-03-10 04:42:11 +0000
commitf01b0a114e2876e97b68903ff02dcb1866a62021 (patch)
tree349ced30ea1706a803f1fb9d22547f280fcbce8f /tools
parentec23b8e1205e969d449834b02984d01a8daf93dc (diff)
parent84c769ce17822eac3788336cbae8f82f03f089cf (diff)
merged trunk
Diffstat (limited to 'tools')
-rwxr-xr-xtools/euca-get-ajax-console4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console
index 37060e74f..e407dd566 100755
--- a/tools/euca-get-ajax-console
+++ b/tools/euca-get-ajax-console
@@ -35,7 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
import boto
import nova
from boto.ec2.connection import EC2Connection
-from euca2ools import Euca2ool, InstanceValidationError, Util, ConnectionFailed
+from euca2ools import Euca2ool, InstanceValidationError, Util
usage_string = """
Retrieves a url to an ajax console terminal
@@ -147,7 +147,7 @@ def main():
try:
euca_conn = euca.make_connection()
- except ConnectionFailed, e:
+ except Exception, e:
print e.message
sys.exit(1)
try: