Merge branch 'master' into rackspace_api

1 files changed, 16 insertions, 11 deletions

diff --git a/nova/exception.py b/nova/exception.py
index 82d08e840..ebd85a5a7 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+# Copyright 2010 Anso Labs, LLC
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
 #
-#        http://www.apache.org/licenses/LICENSE-2.0
+#         http://www.apache.org/licenses/LICENSE-2.0
 #
 #    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
 
 """
 Nova base exception handling, including decorator for re-raising
@@ -47,9 +52,9 @@ def wrap_exception(f):
             return f(*args, **kw)
         except Exception, e:
             if not isinstance(e, Error):
-                # exc_type, exc_value, exc_traceback = sys.exc_info()
+                #exc_type, exc_value, exc_traceback = sys.exc_info()
                 logging.exception('Uncaught exception')
-                # logging.debug(traceback.extract_stack(exc_traceback))
+                #logging.error(traceback.extract_stack(exc_traceback))
                 raise Error(str(e))
             raise
     _wrap.func_name = f.func_name