From 3cae5a2573c96900f224d0145cee5077b01424b5 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 4 Feb 2011 11:36:09 -0600
Subject: Don't swallow exception stack traces by doing 'raise e'; just use
 'raise'

---
 nova/compute/api.py    | 4 ++--
 nova/volume/manager.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index ac02dbcfa..b409dc1e0 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -70,7 +70,7 @@ class API(base.Base):
         except exception.NotFound as e:
             LOG.warning(_("Instance %d was not found in get_network_topic"),
                         instance_id)
-            raise e
+            raise
 
         host = instance['host']
         if not host:
@@ -296,7 +296,7 @@ class API(base.Base):
         except exception.NotFound as e:
             LOG.warning(_("Instance %d was not found during terminate"),
                         instance_id)
-            raise e
+            raise
 
         if (instance['state_description'] == 'terminating'):
             LOG.warning(_("Instance %d is already being terminated"),
diff --git a/nova/volume/manager.py b/nova/volume/manager.py
index 6f8e25e19..3e63e7b26 100644
--- a/nova/volume/manager.py
+++ b/nova/volume/manager.py
@@ -114,7 +114,7 @@ class VolumeManager(manager.Manager):
         except Exception as e:
             self.db.volume_update(context,
                                   volume_ref['id'], {'status': 'error'})
-            raise e
+            raise
 
         now = datetime.datetime.utcnow()
         self.db.volume_update(context,
@@ -141,7 +141,7 @@ class VolumeManager(manager.Manager):
             self.db.volume_update(context,
                                   volume_ref['id'],
                                   {'status': 'error_deleting'})
-            raise e
+            raise
 
         self.db.volume_destroy(context, volume_id)
         LOG.debug(_("volume %s: deleted successfully"), volume_ref['name'])
-- 
cgit 


From 645f4733081dfe03554cc30221ccc1a8b359d1ea Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 4 Feb 2011 16:20:24 -0600
Subject: Removed (newly) unused exception variables

---
 nova/compute/api.py    | 4 ++--
 nova/volume/manager.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index b409dc1e0..4a7c1c9e9 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -67,7 +67,7 @@ class API(base.Base):
         """Get the network topic for an instance."""
         try:
             instance = self.get(context, instance_id)
-        except exception.NotFound as e:
+        except exception.NotFound:
             LOG.warning(_("Instance %d was not found in get_network_topic"),
                         instance_id)
             raise
@@ -293,7 +293,7 @@ class API(base.Base):
         LOG.debug(_("Going to try to terminate %s"), instance_id)
         try:
             instance = self.get(context, instance_id)
-        except exception.NotFound as e:
+        except exception.NotFound:
             LOG.warning(_("Instance %d was not found during terminate"),
                         instance_id)
             raise
diff --git a/nova/volume/manager.py b/nova/volume/manager.py
index 3e63e7b26..5771a6384 100644
--- a/nova/volume/manager.py
+++ b/nova/volume/manager.py
@@ -111,7 +111,7 @@ class VolumeManager(manager.Manager):
 
             LOG.debug(_("volume %s: creating export"), volume_ref['name'])
             self.driver.create_export(context, volume_ref)
-        except Exception as e:
+        except Exception:
             self.db.volume_update(context,
                                   volume_ref['id'], {'status': 'error'})
             raise
@@ -137,7 +137,7 @@ class VolumeManager(manager.Manager):
             self.driver.remove_export(context, volume_ref)
             LOG.debug(_("volume %s: deleting"), volume_ref['name'])
             self.driver.delete_volume(volume_ref)
-        except Exception as e:
+        except Exception:
             self.db.volume_update(context,
                                   volume_ref['id'],
                                   {'status': 'error_deleting'})
-- 
cgit