summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-01-15 22:03:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-20 16:47:49 +0000
commit3c5f108001d14074f9ac0658f4fb780bbdc9be7b (patch)
treecf763bfbfa2cd4b314add74ddf8cddfe907eb057
parent7a8bae92ed18f5e79e4a982c226ec94e197587e8 (diff)
downloadpoky-3c5f108001d14074f9ac0658f4fb780bbdc9be7b.tar.gz
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 <module> from bb import cooker File "lib/bb/cooker.py", line 39, in <module> import prserv.serv File "lib/prserv/serv.py", line 4, in <module> import xmlrpclib,sqlite3 ImportError: No module named sqlite3 (Bitbake rev: 9a57ec705cf5c932d8c2a35852db7a4627c57937) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/prserv/serv.py7
1 files changed, 6 insertions, 1 deletions
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 @@
1import os,sys,logging 1import os,sys,logging
2import signal, time, atexit, threading 2import signal, time, atexit, threading
3from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler 3from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
4import xmlrpclib,sqlite3 4import xmlrpclib
5
6try:
7 import sqlite3
8except ImportError:
9 from pysqlite2 import dbapi2 as sqlite3
5 10
6import bb.server.xmlrpc 11import bb.server.xmlrpc
7import prserv 12import prserv