[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit 02506b082b7c815da2206e6ec53fa599c44941d9
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Tue Apr 13 17:33:37 2010 +0200

    opimd: db_handler: fix compatibility with Python 2.5

diff --git a/framework/subsystems/opimd/db_handler.py b/framework/subsystems/opimd/db_handler.py
index eeff781..483ed9e 100644
--- a/framework/subsystems/opimd/db_handler.py
+++ b/framework/subsystems/opimd/db_handler.py
@@ -70,7 +70,7 @@ def regex_matches(string, pattern):
         if re.search(unicode(pattern), unicode(string)) == None:
             return 0
         return 1
-    except Exception as exp:
+    except Exception, exp:
         logger.error("While matching regex (pattern = %s, string = %s) got: %s",unicode(pattern), unicode(string), exp)
     return 0
 
@@ -145,7 +145,7 @@ class DbHandler(object):
             self.con.commit()
             cur.close()
         
-        except Exception as exp:
+        except Exception, exp:
             logger.error("""The following errors occured when trying to init db: %s\n%s""", _SQLITE_FILE_NAME, str(exp))
             raise 
     def get_create_type_index(self, type):

-- 
FSO frameworkd Debian packaging