The branch, master has been updated via 73d45eb Cope with system version of sqlite. from 731e40e Fix commit handling from specific author.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 73d45eb068a9cbed4712e3e7742f09c9707746aa Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Nov 13 17:26:31 2010 +0100 Cope with system version of sqlite. ----------------------------------------------------------------------- Summary of changes: buildfarm/sqldb.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py index d1ca87d..ca7d235 100644 --- a/buildfarm/sqldb.py +++ b/buildfarm/sqldb.py @@ -33,7 +33,10 @@ from buildfarm.hostdb import ( ) import os -import pysqlite2 +try: + import sqlite3 +except ImportError: + from pysqlite2 import dbapi2 as sqlite3 from storm.database import create_database from storm.locals import Bool, Desc, Int, Unicode, RawStr from storm.store import Store @@ -100,7 +103,7 @@ class StormHostDatabase(HostDatabase): try: self.store.add(newhost) self.store.flush() - except pysqlite2.dbapi2.IntegrityError: + except sqlite3.IntegrityError: raise HostAlreadyExists(name) return newhost -- build.samba.org