summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Berendt <berendt@b1-systems.de>2011-02-26 19:09:57 +0100
committerChristian Berendt <berendt@b1-systems.de>2011-02-26 19:09:57 +0100
commit4229990fa77d6edb73b88e92750a8779c478e40c (patch)
tree4d5103f99ffa2b9cb9280c08631685b67598af2b
parentf623b52a894d0e1227382175cb9b9fcc939f5d7d (diff)
downloadnova-4229990fa77d6edb73b88e92750a8779c478e40c.tar.gz
nova-4229990fa77d6edb73b88e92750a8779c478e40c.tar.xz
nova-4229990fa77d6edb73b88e92750a8779c478e40c.zip
replaced ConnectionFailed with Exception in tools/euca-get-ajax-console
was not working for me with euca2tools 1.2 (version 2007-10-10, release 31337)
-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: