[gnome-continuous-yocto/gnomeostree-3.28-rocko: 640/8267] bitbake: toaster: moved import bb.server.xmlrpc

[Emmanuele Bassi <ebassi src gnome org>]

commit de21205d3d1cb1994d94fea79d024b0e293781bd
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue May 10 17:23:05 2016 +0300

    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: 0c5d691746fb02807568a8a470969a0b68e21915)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/toaster/bldcontrol/bbcontroller.py |    2 +-
 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
 # load Bitbake components
 path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 sys.path.insert(0, path)
-import bb.server.xmlrpc
 
 class BitbakeController(object):
     """ This is the basic class that controlls a bitbake server.
@@ -38,6 +37,7 @@ class BitbakeController(object):
     """
 
     def __init__(self, be):
+        import bb.server.xmlrpc
         self.connection = bb.server.xmlrpc._create_server(be.bbaddress,
                                                           int(be.bbport))[0]