diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 14:13:35 -0500 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 14:13:35 -0500 |
| commit | 3e72c5c9fb3fc429dc1a72290c1b5df8bdcc88fe (patch) | |
| tree | 3d3dd2a7240c74deb4ffd7d015612b83243c5e24 | |
| parent | 3999bb363501c6587f75255333094c9e61bf1828 (diff) | |
| parent | 52a623a2a991e0e091852f8db0317aae9898cf6c (diff) | |
merge lp:nova
| -rwxr-xr-x | tools/euca-get-ajax-console | 4 |
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: |