summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-10 14:23:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-16 22:32:42 (GMT)
commitadbfdbabedde09fc60dede552d9943db96d33b0d (patch)
treea716e664096be8f26d537de80fee374c366f8f05
parenta6a36a91308f4303fdc723f354b7b88e55b84620 (diff)
downloadpoky-adbfdbabedde09fc60dede552d9943db96d33b0d.tar.gz
bitbake: toaster: moved import bb.server.xmlrpc
Moved import xmlrpc module to the place where it's used to avoid toaster crashes when importing bitbake code. NOTE: This patch is made to be able to partly test toaster with bitbake from master. It can be removed as soon as bb.server.xmlrpc is ported to python 3. (Bitbake rev: 69c2b67678a7e72e6926b5158ec5b169e7d9bb30) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/bbcontroller.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py
index 9bddadb..912f67b 100644
--- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py
@@ -30,7 +30,6 @@ from bldcontrol.models import BuildEnvironment, BRLayer, BRVariable, BRTarget, B
30# load Bitbake components 30# load Bitbake components
31path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) 31path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
32sys.path.insert(0, path) 32sys.path.insert(0, path)
33import bb.server.xmlrpc
34 33
35class BitbakeController(object): 34class BitbakeController(object):
36 """ This is the basic class that controlls a bitbake server. 35 """ This is the basic class that controlls a bitbake server.
@@ -38,6 +37,7 @@ class BitbakeController(object):
38 """ 37 """
39 38
40 def __init__(self, be): 39 def __init__(self, be):
40 import bb.server.xmlrpc
41 self.connection = bb.server.xmlrpc._create_server(be.bbaddress, 41 self.connection = bb.server.xmlrpc._create_server(be.bbaddress,
42 int(be.bbport))[0] 42 int(be.bbport))[0]
43 43