summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Fenn <fennm@deshawresearch.com>2014-09-10 12:15:37 -0400
committerMichael Fenn <fennm@deshawresearch.com>2014-09-10 12:15:37 -0400
commit788ac2be910d0cef1c888c31e9465a26f4e45090 (patch)
tree927bd63fef1c3625e57539a4ccfc2acc5d51ee4e
parent43d65f4bcea9db7abc03792839ad07a51e1af6d3 (diff)
downloadbcfg2-788ac2be910d0cef1c888c31e9465a26f4e45090.tar.gz
bcfg2-788ac2be910d0cef1c888c31e9465a26f4e45090.tar.bz2
bcfg2-788ac2be910d0cef1c888c31e9465a26f4e45090.zip
Use older nested try syntax for finally for python 2.4 compat
-rw-r--r--src/lib/Bcfg2/Reporting/Storage/DjangoORM.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index 0bb3111ae..98226dc4e 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -367,10 +367,11 @@ class DjangoORM(StorageBase):
"""Import the data into the backend"""
try:
- self._import_interaction(interaction)
- except:
- self.logger.error("Failed to import interaction: %s" %
- traceback.format_exc().splitlines()[-1])
+ try:
+ self._import_interaction(interaction)
+ except:
+ self.logger.error("Failed to import interaction: %s" %
+ traceback.format_exc().splitlines()[-1])
finally:
self.logger.debug("%s: Closing database connection" %
self.__class__.__name__)