From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 14 May 2013 12:04:14 +0000 (+0300)
Subject: bin/bitbake: Fix queue import for pyhton 2 and 3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=782bc0e797802224f06cb6f9098a50d658c86523;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bin/bitbake: Fix queue import for pyhton 2 and 3

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bin/bitbake b/bin/bitbake
index 1f9bbc40397..0ca82e5a7ba 100755
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -252,7 +252,10 @@ Default BBFILES are the .bb files in the current directory.""")
         server.saveConnectionDetails()
     except:
         while True:
-            import queue
+            try:
+                import queue
+            except ImportError:
+                import Queue as queue
             try:
                 event = server.event_queue.get(block=False)
             except (queue.Empty, IOError):