From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 3 Dec 2010 17:15:04 +0000 (-0500)
Subject: Error more pleasantly when trying to use python2.4
X-Git-Tag: 2011-1~3097
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1e3b83f96bda9f48a105100a6639e91d086ba14d;p=openembedded-core.git

Error more pleasantly when trying to use python2.4

(Bitbake rev: 57402ee727c8c1d8f5017534fb0f5e0b20aaaa5b)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 8212130683..1dbaf96b41 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -210,16 +210,17 @@ Default BBFILES are the .bb files in the current directory.""")
         ui = "knotty"
 
     try:
-        # Dynamically load the UI based on the ui name. Although we
-        # suggest a fixed set this allows you to have flexibility in which
-        # ones are available.
-        uimodule = __import__("bb.ui", fromlist = [ui])
-        ui_init = getattr(uimodule, ui).init
-    except AttributeError:
-        print("FATAL: Invalid user interface '%s' specified. " % ui)
-        print("Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'.")
-    else:
-        return_value = server.BitbakeUILauch().launch(serverinfo, ui_init, serverConnection.connection, serverConnection.events)
+        try:
+            # Dynamically load the UI based on the ui name. Although we
+            # suggest a fixed set this allows you to have flexibility in which
+            # ones are available.
+            uimodule = __import__("bb.ui", fromlist = [ui])
+            ui_init = getattr(uimodule, ui).init
+        except AttributeError:
+            print("FATAL: Invalid user interface '%s' specified. " % ui)
+            print("Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'.")
+        else:
+            return_value = server.BitbakeUILauch().launch(serverinfo, ui_init, serverConnection.connection, serverConnection.events)
     finally:
         serverConnection.terminate()