aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Khouya <dakhouya@gmail.com>2020-07-01 12:27:40 -0400
committerSteve Sakoman <steve@sakoman.com>2020-07-13 05:28:17 -1000
commit45e32f2651d35bf7a315af95cfe0b1070e038c9e (patch)
tree477c5a3408741684f2a5979faf4932a8234cfc45
parent1d3892d93ee9688d69f5bb5ea6aef8b1152bd1e3 (diff)
downloadbitbake-contrib-45e32f2651d35bf7a315af95cfe0b1070e038c9e.tar.gz
lib/ui/taskexp: Validate gi import
When running bitbake -g -u taskexp without having gi python module or and invalid gtk version, bitbake fails with a stack trace. In case of import or version error, bitbake should exit with an error message instead of a stack trace. Signed-off-by: David Khouya <dakhouya@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2a2c507f239b047f34765312df4168030e38b90d) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--lib/bb/ui/taskexp.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/bb/ui/taskexp.py b/lib/bb/ui/taskexp.py
index 8fff24423..336d197de 100644
--- a/lib/bb/ui/taskexp.py
+++ b/lib/bb/ui/taskexp.py
@@ -8,9 +8,15 @@
#
import sys
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk, Gdk, GObject
+
+try:
+ import gi
+ gi.require_version('Gtk', '3.0')
+except ValueError:
+ sys.exit("FATAL: Gtk version needs to be 3.0")
+except ImportError:
+ sys.exit("FATAL: Gtk ui could not load the required gi python module")
+
import threading
from xmlrpc import client
import bb