From 3c5f108001d14074f9ac0658f4fb780bbdc9be7b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 15 Jan 2012 22:03:53 +0100 Subject: prserv: fix import of sqlite3 * this is used in all other bitbake parts where sqlite3 is used, don't know why it wasn't used here, but it fails e.g. on Gentoo Traceback (most recent call last): File "bin/bitbake", line 39, in from bb import cooker File "lib/bb/cooker.py", line 39, in import prserv.serv File "lib/prserv/serv.py", line 4, in import xmlrpclib,sqlite3 ImportError: No module named sqlite3 (Bitbake rev: 9a57ec705cf5c932d8c2a35852db7a4627c57937) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- bitbake/lib/prserv/serv.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/prserv') diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index a759fa7417..fa437f964c 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py @@ -1,7 +1,12 @@ import os,sys,logging import signal, time, atexit, threading from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler -import xmlrpclib,sqlite3 +import xmlrpclib + +try: + import sqlite3 +except ImportError: + from pysqlite2 import dbapi2 as sqlite3 import bb.server.xmlrpc import prserv -- cgit v1.2.3-54-g00ecf