diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-04 22:29:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-04 22:29:23 +0000 |
| commit | c510592fe94e81ff0332ae9d209a893d8057ad4a (patch) | |
| tree | 119c6b1bc582fb81ef1ce8bcb90523dce937378e /nova/api | |
| parent | 339580bba5274788170275a844c5917c8f1dd9e6 (diff) | |
| parent | cf4505a7b34858efe51a76434617d47e8f9d4ea9 (diff) | |
Merge "Fix except format to match HACKING"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 09324bb3c..01cf61860 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -398,7 +398,7 @@ class CloudController(object): (out, err) = utils.execute('ssh-keygen', '-l', '-f', '%s' % (pubfile)) return out.split(' ')[1] - except: + except Exception: raise finally: shutil.rmtree(tmpdir) |