summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-14 15:04:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-14 15:04:18 +0300
commitbd27cca7e6817e6cbf3cba38e05f0877e3f03d6a (patch)
treea2000cbc5f19d269020d42d50276c9f04c345e9f /bitbake
parent0c8173d7dcd5d3338f6619ad39cb17fc241a8123 (diff)
downloadpoky-bd27cca7e6817e6cbf3cba38e05f0877e3f03d6a.tar.gz
bitbake: bin/bitbake: Fix queue import for pyhton 2 and 3
(Bitbake rev: 782bc0e797802224f06cb6f9098a50d658c86523) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 1f9bbc4039..0ca82e5a7b 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -252,7 +252,10 @@ Default BBFILES are the .bb files in the current directory.""")
252 server.saveConnectionDetails() 252 server.saveConnectionDetails()
253 except: 253 except:
254 while True: 254 while True:
255 import queue 255 try:
256 import queue
257 except ImportError:
258 import Queue as queue
256 try: 259 try:
257 event = server.event_queue.get(block=False) 260 event = server.event_queue.get(block=False)
258 except (queue.Empty, IOError): 261 except (queue.Empty, IOError):