summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Reporting
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-09-10 20:20:04 -0500
committerSol Jerome <sol.jerome@gmail.com>2014-09-10 20:20:04 -0500
commit7eb61f7e6b721d86d2d30a96401f4e0281f4c966 (patch)
tree98a885068ff94af3cd56783b39d6e301a4b7d0a5 /src/lib/Bcfg2/Reporting
parentf2209ac6fb7b86a91e052a33828861cabf185245 (diff)
parent9ffc3559ab4040fe8a02269db7ff94f8e9849af5 (diff)
downloadbcfg2-7eb61f7e6b721d86d2d30a96401f4e0281f4c966.tar.gz
bcfg2-7eb61f7e6b721d86d2d30a96401f4e0281f4c966.tar.bz2
bcfg2-7eb61f7e6b721d86d2d30a96401f4e0281f4c966.zip
Merge branch 'bcfg2-1.3.5-python2.4-compat' of https://github.com/fennm/bcfg2 into maint
Diffstat (limited to 'src/lib/Bcfg2/Reporting')
-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__)